feat(ui/sim): change SIM icon colors in dark mode

SettingsLib/ButtonPreference/build.gradle

@@ -9,7 +9,7 @@ android {
     namespace 'com.android.settingslib.widget.preference.button'
 
     defaultConfig {
-        minSdk 21
+        minSdk 23
         versionCode 1
         versionName "1.0"
     }

SettingsLib/CollapsingToolbarBaseActivity/build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
 }
 
 def SettingsLibCollapsingToolbarBaseActivity = '../fwb/packages/SettingsLib/CollapsingToolbarBaseActivity'

SettingsLib/LayoutPreference/build.gradle

@@ -8,7 +8,7 @@ android {
     namespace 'com.android.settingslib.widget.preference.layout'
 
     defaultConfig {
-        minSdk 21
+        minSdk 23
         versionCode 1
         versionName "1.0"
     }

SettingsLib/SettingsTheme/build.gradle

@@ -9,7 +9,7 @@ android {
     namespace 'com.android.settingslib.widget.theme'
 
     defaultConfig {
-        minSdk 21
+        minSdk 23
         versionCode 1
         versionName "1.0"
     }

SettingsLib/SettingsThemeFlags/build.gradle

@@ -6,7 +6,7 @@ android {
     namespace 'com.android.settingslib.widget.theme.flags'
 
     defaultConfig {
-        minSdk 21
+        minSdk 23
     }
 
     sourceSets {

SettingsLib/TwoTargetPreference/build.gradle

@@ -8,7 +8,7 @@ android {
     namespace 'com.android.settingslib.widget.preference.twotarget'
 
     defaultConfig {
-        minSdk 21
+        minSdk 23
         versionCode 1
         versionName "1.0"
     }

SettingsLib/fetch.sh

@@ -8,7 +8,7 @@ declare -r SHORT_OPTS=u:,t:
 declare -r LONG_OPTS=set-repo-url:,set-repo-tag:,get-repo-url,get-repo-tag,apply-patches-only
 declare -r FWB_DIR='fwb'
 declare REPO_URL='https://android.googlesource.com/platform/frameworks/base.git'
-declare REPO_TAG='android-16.0.0_r1'
+declare REPO_TAG='android-16.0.0_r4'
 declare -a LIBS=(
     'BannerMessagePreference'
     'ButtonPreference'

build.gradle

@@ -160,6 +160,7 @@ android {
         // Instead of failing the build due to missing translations, just inform us to avoid
         // mistakes during manual import
         informational 'MissingTranslation'
+        disable 'GradlePluginVersion'
     }
 
     dependenciesInfo {
@@ -267,6 +268,7 @@ dependencies {
         exclude group: 'org.hamcrest', module: 'hamcrest-core'
     }
 
+    implementation libs.errorprone.annotations
     errorprone libs.errorprone
     annotationProcessor libs.errorprone
     testAnnotationProcessor libs.errorprone

gradle/libs.versions.toml

@@ -6,13 +6,13 @@
 # https://mvnrepository.com/artifact/androidx.room/room-runtime
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/room/room-compiler/
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/room/room-runtime/
-room = "2.7.0-beta01"
+room = "2.8.0-alpha01"
 # https://mvnrepository.com/artifact/com.google.dagger/hilt-android
 # https://mvnrepository.com/artifact/com.google.dagger/hilt-compiler
 # https://android.googlesource.com/platform/external/dagger2
 hilt = "2.55"
 # https://mvnrepository.com/artifact/io.github.takahirom.roborazzi/roborazzi
-roborazzi = "1.50.0"
+roborazzi = "1.54.0"
 # https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core
 # https://mvnrepository.com/artifact/androidx.test.espresso/espresso-contrib
 espresso = "3.7.0"
@@ -22,21 +22,21 @@ espresso = "3.7.0"
 # ========================================
 # https://mvnrepository.com/artifact/com.android.application/com.android.application.gradle.plugin
 # https://mvnrepository.com/artifact/com.android.library/com.android.library.gradle.plugin
-agp = "8.10.1"
+agp = "8.11.2"
 # https://plugins.gradle.org/plugin/org.jetbrains.kotlin.android
 kotlin = "2.1.10"
-# https://mvnrepository.com/artifact/net.ltgt.errorprone/net.ltgt.errorprone.gradle.plugin
-errorprone = "4.2.0"
+# https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
+errorprone = "2.45.0"
 # https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kover-gradle-plugin
-kover = "0.9.1"
+kover = "0.9.4"
 
 [libraries]
 # https://mvnrepository.com/artifact/androidx.activity/activity
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/activity/activity/
-activity = { module = "androidx.activity:activity", version = "1.11.0-alpha01" }
+activity = { module = "androidx.activity:activity", version = "1.12.0-alpha08" }
 # https://mvnrepository.com/artifact/androidx.annotation/annotation
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/annotation/annotation-jvm/
-annotation = { module = "androidx.annotation:annotation", version = "1.9.0-rc01" }
+annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } # TODO: AOSP sources use 1.11.0-alpha01; upgrade when available in Maven Central
 # https://mvnrepository.com/artifact/androidx.appcompat/appcompat
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/appcompat/appcompat/
 appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" } # TODO: AOSP sources use 1.8.0-alpha01; upgrade when available in Maven Central }
@@ -46,18 +46,18 @@ arch-core-testing = { module = "androidx.arch.core:core-testing", version = "2.2
 awaitility = { module = "org.awaitility:awaitility", version = "4.3.0" }
 # https://mvnrepository.com/artifact/androidx.biometric/biometric
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/biometric/biometric/
-biometric = { module = "androidx.biometric:biometric", version = "1.4.0-alpha02" }
+biometric = { module = "androidx.biometric:biometric", version = "1.4.0-alpha04" }
 # https://mvnrepository.com/artifact/androidx.collection/collection
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/collection/collection-jvm/
-collection = { module = "androidx.collection:collection", version = "1.5.0-beta03" }
+collection = { module = "androidx.collection:collection", version = "1.5.0" }
 # https://mvnrepository.com/artifact/androidx.coordinatorlayout/coordinatorlayout
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/coordinatorlayout/coordinatorlayout/
 coordinatorlayout = { module = "androidx.coordinatorlayout:coordinatorlayout", version = "1.3.0-alpha02" }
 # https://mvnrepository.com/artifact/androidx.core/core
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/core/core/
-core = { module = "androidx.core:core", version = "1.16.0-beta01" }
-# https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
-errorprone = { module = "com.google.errorprone:error_prone_core", version = "2.42.0" }
+core = { module = "androidx.core:core", version = "1.17.0" } # TODO: AOSP sources use 1.19.0-alpha01; upgrade when available in Maven Central }
+errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
+errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
 # https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core
 espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
@@ -70,12 +70,12 @@ hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hil
 junit = { module = "junit:junit", version = "4.13.2" }
 # https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-livedata
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/lifecycle/lifecycle-livedata/
-livedata = { module = "androidx.lifecycle:lifecycle-livedata", version = "2.9.0-alpha12" }
+livedata = { module = "androidx.lifecycle:lifecycle-livedata", version = "2.10.0-alpha04" }
 # https://mvnrepository.com/artifact/com.google.android.material/material
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/extras/material-design-x/com/google/android/material/material/
-material = { module = "com.google.android.material:material", version = "1.13.0-alpha08" }
+material = { module = "com.google.android.material:material", version = "1.14.0-alpha02" }
 # https://mvnrepository.com/artifact/org.mockito/mockito-core
-mockito = { module = "org.mockito:mockito-core", version = "5.20.0" }
+mockito = { module = "org.mockito:mockito-core", version = "5.21.0" }
 # https://mvnrepository.com/artifact/androidx.preference/preference
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/preference/preference/
 preference = { module = "androidx.preference:preference", version = "1.2.1" } # TODO AOSP sources use 1.3.0-alpha01; upgrade when available in Maven Central }
@@ -101,12 +101,13 @@ test-rules = { module = "androidx.test:rules", version = "1.7.0" }
 test-runner = { module = "androidx.test:runner", version = "1.7.0" }
 # https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-viewmodel
 # https://android.googlesource.com/platform/prebuilts/sdk/+/refs/heads/main/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-android/
-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version = "2.9.0-alpha12" }
+viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version = "2.10.0-alpha04" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-errorprone = { id = "net.ltgt.errorprone", version.ref = "errorprone" }
+# https://mvnrepository.com/artifact/net.ltgt.errorprone/net.ltgt.errorprone.gradle.plugin
+errorprone = { id = "net.ltgt.errorprone", version = "4.2.0" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

res/values-ko-rKR/strings.xml

@@ -25,8 +25,8 @@
     <string name="scheduler_delete_message">"이 작업은 되돌릴 수 없습니다. 계속 하시겠습니까?"</string>
     <string name="scheduler_days_of_week_none">"차단하지 않음"</string>
     <string name="scheduler_days_of_week_all">"매일"</string>
-    <string name="scheduler_start_time_custom_summary">"<![CDATA[<b><xliff:g name="date_time" example="today, 6 AM">%1$s</xliff:g></b>]]>에 자동으로 켜짐"</string>
-    <string name="scheduler_end_time_custom_summary">"<![CDATA[<b><xliff:g name="date_time" example="today, 10 PM">%1$s</xliff:g></b>]]>에 자동으로 꺼짐"</string>
+    <string name="scheduler_start_time_custom_summary">"<![CDATA[<b><xliff:g name="date_time" example="today, 6 AM">%1$s</xliff:g></b><xliff:g name="date_time_separator">%2$1s</xliff:g>]]>에 자동으로 켜짐"</string>
+    <string name="scheduler_end_time_custom_summary">"<![CDATA[<b><xliff:g name="date_time" example="today, 10 PM">%1$s</xliff:g></b><xliff:g name="date_time_separator">%2$1s</xliff:g>]]>에 자동으로 꺼짐"</string>
     <string name="scheduler_start_time_none_summary">"자동으로 켜지지 <b>않음</b>"</string>
     <string name="scheduler_end_time_none_summary">"자동으로 끄지 <b>않음</b>"</string>
     <string name="scheduler_no_schedule_summary">"일정 없음"</string>

res/values-v31/arrays.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Taken from frameworks/base/core/res/res/values/arrays.xml -->
+    <array name="sim_colors">
+        <item>@color/Teal_700</item>
+        <item>@color/Blue_700</item>
+        <item>@color/Indigo_700</item>
+        <item>@color/Purple_700</item>
+        <item>@color/Pink_700</item>
+        <item>@color/Red_700</item>
+        <!-- Legacy (Android Q) color palette still exists in Android OS, but starting from
+             Android S, there's a new color palette available in SIM rename dialog. -->
+        <item>@color/SIM_color_cyan</item>
+        <item>@color/SIM_color_blue</item>
+        <item>@color/SIM_color_green</item>
+        <item>@color/SIM_color_purple</item>
+        <item>@color/SIM_color_pink</item>
+        <item>@color/SIM_color_orange</item>
+    </array>
+
+    <array name="sim_dark_mode_colors">
+        <item>@color/Teal_300</item>
+        <item>@color/Blue_300</item>
+        <item>@color/Indigo_300</item>
+        <item>@color/Purple_300</item>
+        <item>@color/Pink_300</item>
+        <item>@color/Red_300</item>
+        <item>@color/SIM_dark_mode_color_cyan</item>
+        <item>@color/SIM_dark_mode_color_blue</item>
+        <item>@color/SIM_dark_mode_color_green</item>
+        <item>@color/SIM_dark_mode_color_purple</item>
+        <item>@color/SIM_dark_mode_color_pink</item>
+        <item>@color/SIM_dark_mode_color_orange</item>
+    </array>
+</resources>

res/values-v31/colors.xml

@@ -7,4 +7,19 @@
     <color name="schedule_card_day_selected_background_color">@android:color/system_neutral2_600</color>
     <color name="schedule_card_day_selected_text_color">@android:color/system_neutral2_50</color>
     <color name="schedule_card_hairline_color">@android:color/transparent</color>
+
+    <!-- Multi-sim sim colors. Keep in sync with frameworks/base/core/res/res/values/colors.xml
+         DO NOT CHANGE HERE! Create a "colors.xml" per SDK when need to sync! -->
+    <color name="SIM_color_cyan">#ff006D74</color><!-- Material Custom Cyan -->
+    <color name="SIM_dark_mode_color_cyan">#ff4DD0E1</color><!-- Material Cyan 300 -->
+    <color name="SIM_color_blue">#ff185ABC</color><!-- Material Blue 800 -->
+    <color name="SIM_dark_mode_color_blue">#ff8AB4F8</color><!-- Material Blue 300 -->
+    <color name="SIM_color_green">#ff137333</color><!-- Material Green 800 -->
+    <color name="SIM_dark_mode_color_green">#ff81C995</color><!-- Material Green 300 -->
+    <color name="SIM_color_purple">#ff7627bb</color><!-- Material Purple 800 -->
+    <color name="SIM_dark_mode_color_purple">#ffC58AF9</color><!-- Material Purple 300 -->
+    <color name="SIM_color_pink">#ffb80672</color><!-- Material Pink 800 -->
+    <color name="SIM_dark_mode_color_pink">#ffff8bcb</color><!-- Material Pink 300 -->
+    <color name="SIM_color_orange">#ff995400</color><!-- Material Custom Orange -->
+    <color name="SIM_dark_mode_color_orange">#fffcad70</color><!-- Material Orange 300 -->
 </resources>

res/values-v34/arrays.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Keep in sync with frameworks/base/core/res/res/values/arrays.xml
+         DO NOT CHANGE HERE! Create an "arrays.xml" per SDK when need to sync! -->
+    <array name="sim_colors">
+        <item>@color/SIM_color_cyan</item>
+        <item>@color/SIM_color_blue</item>
+        <item>@color/SIM_color_green</item>
+        <item>@color/SIM_color_purple</item>
+        <item>@color/SIM_color_pink</item>
+        <item>@color/SIM_color_orange</item>
+    </array>
+
+    <array name="sim_dark_mode_colors">
+        <item>@color/SIM_dark_mode_color_cyan</item>
+        <item>@color/SIM_dark_mode_color_blue</item>
+        <item>@color/SIM_dark_mode_color_green</item>
+        <item>@color/SIM_dark_mode_color_purple</item>
+        <item>@color/SIM_dark_mode_color_pink</item>
+        <item>@color/SIM_dark_mode_color_orange</item>
+    </array>
+</resources>

res/values-v36/themes_expressive.xml

@@ -7,5 +7,16 @@
 
         <item name="scheduleCardCollapsedBackgroundColor">@color/settingslib_materialColorSurfaceBright</item>
         <item name="scheduleCardExpandedBackgroundColor">@color/settingslib_materialColorSurfaceDim</item>
+
+        <item name="expressiveTwoTargetPreferenceTheme">@style/ExpressiveTwoTargetPreferenceTheme.Custom</item>
+    </style>
+
+    <style name="ExpressiveTwoTargetPreferenceTheme.Custom" parent="ExpressiveTwoTargetPreferenceTheme">
+        <item name="expressiveTwoTargetDividerStyle">@style/ExpressiveTwoTargetDividerStyle.Custom</item>
+    </style>
+
+    <style name="ExpressiveTwoTargetDividerStyle.Custom" parent="ExpressiveTwoTargetDividerStyle">
+        <!-- Remove unnecessary padding at the start of the divider in the expressive theme. -->
+        <item name="android:paddingStart">0dip</item>
     </style>
 </resources>

res/values/arrays.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Taken from frameworks/base/core/res/res/values/arrays.xml -->
+    <array name="sim_colors">
+        <item>@color/Teal_700</item>
+        <item>@color/Blue_700</item>
+        <item>@color/Indigo_700</item>
+        <item>@color/Purple_700</item>
+        <item>@color/Pink_700</item>
+        <item>@color/Red_700</item>
+    </array>
+
+    <array name="sim_dark_mode_colors">
+        <item>@color/Teal_300</item>
+        <item>@color/Blue_300</item>
+        <item>@color/Indigo_300</item>
+        <item>@color/Purple_300</item>
+        <item>@color/Pink_300</item>
+        <item>@color/Red_300</item>
+    </array>
+</resources>

res/values/colors.xml

@@ -13,4 +13,18 @@
     <color name="schedule_card_day_unselected_stroke_color">?android:attr/colorControlHighlight</color>
     <color name="schedule_card_arrow_background_color">@android:color/transparent</color>
     <color name="schedule_card_hairline_color">#28000000</color>
+
+    <!-- Multi-sim sim colors. Taken from frameworks/base/core/res/res/values/colors.xml -->
+    <color name="Teal_700">#ff00796b</color>
+    <color name="Teal_300">#ff4db6ac</color>
+    <color name="Blue_700">#ff3367d6</color>
+    <color name="Blue_300">#ff64b5f6</color>
+    <color name="Indigo_700">#ff303f9f</color>
+    <color name="Indigo_300">#ff7986cb</color>
+    <color name="Purple_700">#ff7b1fa2</color>
+    <color name="Purple_300">#ffba68c8</color>
+    <color name="Pink_700">#ffc2185b</color>
+    <color name="Pink_300">#fff06292</color>
+    <color name="Red_700">#ffc53929</color>
+    <color name="Red_300">#ffe57373</color>
 </resources>

settings.gradle

@@ -6,8 +6,20 @@ pluginManagement {
     }
 }
 
+buildscript {
+    ext {
+        agpVersion = new File(rootProject.projectDir.absoluteFile, "gradle/libs.versions.toml")
+            .readLines()
+            .stream()
+            .filter((line) -> line.startsWith("agp ="))
+            .map((line) -> line.split('"')[1])
+            .findFirst()
+            .get()
+    }
+}
+
 plugins {
-    id 'com.android.settings' version '8.10.1'
+    id 'com.android.settings' version "${agpVersion}"
 }
 
 dependencyResolutionManagement {

src/com/github/iusmac/sevensim/DirectBootAwareBroadcastReceiver.java

@@ -43,7 +43,7 @@ public void onReceive(final Context context, final Intent intent) {
 
         mLogger = mLoggerFactory.create(getClass().getSimpleName());
 
-        mLogger.d("onReceive() : intent=" + intent);
+        mLogger.d("onReceive() : intent=%s", intent);
 
         final LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
         final String action = intent.getAction() != null ? intent.getAction() : "";