Merge December 2025 QPR2 Patches (android-16.0.0_r4) (#91)

* SettingsLib: bump to `android-16.0.0_r4` tag

* SettingsLib: bump `minSdk` version to 23

https://android.googlesource.com/platform/frameworks/base/+/40ba4786d08b0618fe77ce7435116dbd41f2fb12 ("Update SettingsLib/DataStore min_sdk_version to 23.")

* CollapsingToolbarBaseActivity: add APIs for action button

https://android.googlesource.com/platform/frameworks/base/+/7e207744232a1a9f22ba6edafe26d0e575290090 ("Added button in CollapsingToolbar")

* CollapsingToolbarBaseActivity: add APIs for trailing buttons (primary/secondary/action)

https://android.googlesource.com/platform/frameworks/base/+/5deb69739d62f225dd8ba15f0987250d107a1145 ("[Expressive design] Add trailing buttons to CollapsingToolbar")

* CollapsingToolbarBaseActivity: add API to toggle Toolbar trailing buttons

Now we have a trailing buttons view holding the action, primary &
secondary buttons not just the action button, so refactoring is needed.

* CollapsingToolbarBaseActivity: collapse toolbar when hosting multiple fragments

https://android.googlesource.com/platform/frameworks/base/+/e0bf8cb02e2bbab0dea2ec1d1153b1b8818b6677 ("Collapse toolbar when hosting multiple fragments")

* SettingsLib/CollapsingToolbarBaseActivity: fix compilation issues

* ScrollableToolbarItemLayout is a Kotlin class.

---

/home/runner/work/7SIM/7SIM/SettingsLib/fwb/packages/SettingsLib/CollapsingToolbarBaseActivity/src/com/android/settingslib/collapsingtoolbar/CollapsingToolbarBaseActivity.java:34: error: cannot find symbol
import com.android.settingslib.collapsingtoolbar.widget.ScrollableToolbarItemLayout;
                                                       ^
  symbol:   class ScrollableToolbarItemLayout
  location: package com.android.settingslib.collapsingtoolbar.widget

* Bump `Room` to `v2.8.0-alpha01` (`android-16.0.0_r4` tag)

* Bump `Material3` to `v1.14.0-alpha02` (`android-16.0.0_r4` tag)

* Bump AndroidX deps to `android-16.0.0_r4` tag

* CollapsingToolbarBaseActivity: fix compilations errors

/home/runner/work/7SIM/7SIM/src/com/github/iusmac/sevensim/ui/components/CollapsingToolbarBaseActivity.java:87: error: cannot find symbol
                  .map((v) -> (View) v.getParent());
                                      ^
symbol:   method getParent()
location: variable v of type Object

* SimPinFeederTest: increase task timeout in CI environment to 5 seconds

GitHub Actions runners are very slow sometimes, which timeouts our
tests, probably due to JVM waiting for resources from the OS such as
processor. We already faced a similar issue in
1b353b0 and 6946b97, so increasing timeout a bit should resolve the
issue. To maintain speed when testing locally, we still want to timeout
after 3 seconds.

    org.awaitility.core.ConditionTimeoutException: Condition with Lambda expression in com.github.iusmac.sevensim.telephony.SimPinFeederTest was not fulfilled within 3 seconds.
            at org.awaitility.core.ConditionAwaiter.await(ConditionAwaiter.java:167)
            at org.awaitility.core.CallableCondition.await(CallableCondition.java:78)
            at org.awaitility.core.CallableCondition.await(CallableCondition.java:26)
            at org.awaitility.core.ConditionFactory.until(ConditionFactory.java:1160)
            at org.awaitility.core.ConditionFactory.until(ConditionFactory.java:1129)
            at com.github.iusmac.sevensim.telephony.SimPinFeederTest.assertTaskInState(SimPinFeederTest.java:879)
            at com.github.iusmac.sevensim.telephony.SimPinFeederTest.test_ShouldUnlockWhenAttemptsRemainingIsAtLeastThree_SinceS(SimPinFeederTest.java:274)

---

Another symptom that GitHub Actions runners are very slow, is that we
even got a NPE in the SimPinFeeder thread that runs in parallel, because
the main/test thread already terminated (due to a fixed timeout), and
recycled objects that aren't reachable anymore.

    Exception in thread "Thread-71" java.lang.NullPointerException: Cannot invoke "android.telephony.TelephonyManager.getSimState()" because "this.mTelephonyManager" is null
            at com.github.iusmac.sevensim.telephony.SimPinFeeder$SimCard.toString(SimPinFeeder.java:325)
            at java.base/java.util.Formatter$FormatSpecifier.printString(Formatter.java:3158)
            at java.base/java.util.Formatter$FormatSpecifier.print(Formatter.java:3036)
            at java.base/java.util.Formatter.format(Formatter.java:2791)
            at java.base/java.util.Formatter.format(Formatter.java:2728)
            at java.base/java.lang.String.format(String.java:4431)
            at com.github.iusmac.sevensim.Logger.format(Logger.java:112)
            at com.github.iusmac.sevensim.Logger.v(Logger.java:56)
            at com.github.iusmac.sevensim.telephony.SimPinFeeder.run(SimPinFeeder.java:99)

* SimPinFeederTest: fix compilation errors

/home/runner/work/7SIM/7SIM/tests/test/java/com/github/iusmac/sevensim/telephony/SimPinFeederTest.java:120: error: element value must be a constant expression
    @test(timeout = TASK_WAIT_TIMEOUT_MILLIS)

* Revert "fix(ui/PrimarySwitchPreference): address extra divider empty space [Expressive Design] (#79)"

This reverts commit 60c5164.

* fix(ui/PrimarySwitchPreference): address extra divider empty space [Expressive Design]

In the expressive theme introduced in Android 16 (Baklava), the switch
preference used in the SIM list activity contains additional space at
the beginning of the parent layout causing the title (e.g., SIM name)
and summary (e.g., next upcoming schedule) text views that precede it to
wrap earlier.

* Update golden screenshots for Roborazzi tests

Author: iusmac

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'

gradle/libs.versions.toml

@@ -6,7 +6,7 @@
 # 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
@@ -33,10 +33,10 @@ kover = "0.9.1"
 [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,16 +46,16 @@ 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" }
+core = { module = "androidx.core:core", version = "1.17.0" } # TODO: AOSP sources use 1.19.0-alpha01; upgrade when available in Maven Central }
 # https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
 errorprone = { module = "com.google.errorprone:error_prone_core", version = "2.42.0" }
 # https://mvnrepository.com/artifact/androidx.test.espresso/espresso-core
@@ -70,10 +70,10 @@ 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" }
 # https://mvnrepository.com/artifact/androidx.preference/preference
@@ -101,7 +101,7 @@ 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" }

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>

src/com/github/iusmac/sevensim/ui/components/CollapsingToolbarBaseActivity.java

@@ -1,5 +1,6 @@
 package com.github.iusmac.sevensim.ui.components;
 
+import android.annotation.DrawableRes;
 import android.app.ActionBar;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -37,7 +38,7 @@ public abstract class CollapsingToolbarBaseActivity extends FragmentActivity {
     private CollapsingToolbarDelegate mToolbardelegate;
     private ToolbarDecorator mToolbarDecorator;
     private ViewModel mViewModel;
-    private Optional<View> mActionButton = Optional.empty();
+    private Optional<View> mTrailingButtons = Optional.empty();
 
     @Override
     protected void onCreate(final @Nullable Bundle savedInstanceState) {
@@ -46,6 +47,8 @@ protected void onCreate(final @Nullable Bundle savedInstanceState) {
         EdgeToEdgeUtils.enable(this);
         super.onCreate(savedInstanceState);
 
+        getToolbarDelegate().registerToolbarCollapseBehavior(this);
+
         final boolean isExpressiveTheme = SettingsThemeHelper.isExpressiveTheme(this);
         if (isExpressiveTheme) {
             setTheme(R.style.Theme_SubSettingsBase_Expressive_Custom);
@@ -78,10 +81,14 @@ protected void onCreate(final @Nullable Bundle savedInstanceState) {
                 getAppBarLayout().setExpanded(true);
             }
             if (isExpressiveTheme) {
-                mActionButton = Optional.ofNullable(getToolbarDelegate().getToolbar().findViewById(
-                            com.android.settingslib.collapsingtoolbar.R.id.action_button));
-                // Hide the action button by default when expressive theme is enabled.
-                setActionButtonEnabled(false);
+                mTrailingButtons = Optional.<View>ofNullable(getToolbarDelegate().getToolbar()
+                        // Use action button view to find the trailing buttons parent
+                        .findViewById(com.android.settingslib.collapsingtoolbar.R.id.action_button))
+                    .map((v) -> (View) v.getParent());
+                // Hide the trailing buttons view by default when expressive theme is enabled to
+                // avoid the blank space at the end of the Toolbar added in XML, which we can't
+                // edit. This will allow for the Toolbar's title & subtitle to fully expand
+                setTrailingButtonsEnabled(false);
             }
             // Our use case requires the CollapsingToolbar to be permanently lifted above the
             // scrollable content (safe to disable; less animations, better performance)
@@ -129,6 +136,52 @@ public void setSubtitle(final @StringRes int subtitleId) {
         setSubtitle(getText(subtitleId));
     }
 
+    /**
+     * Show/Hide the primary button on the Toolbar.
+     * @param enabled true to show the button, otherwise it's hidden.
+     */
+    public void setPrimaryButtonEnabled(final boolean enabled) {
+        getToolbarDelegate().setPrimaryButtonEnabled(enabled);
+    }
+
+    /** Set the icon to the primary button */
+    public void setPrimaryButtonIcon(final @DrawableRes int drawableRes) {
+        getToolbarDelegate().setPrimaryButtonIcon(this, drawableRes);
+    }
+
+    /** Set the OnClick listener to the primary button. */
+    public void setPrimaryButtonOnClickListener(final @Nullable View.OnClickListener listener) {
+        getToolbarDelegate().setPrimaryButtonOnClickListener(listener);
+    }
+
+    /** Set the content description to the primary button */
+    public void setPrimaryButtonContentDescription(final @Nullable CharSequence contentDescription) {
+        getToolbarDelegate().setPrimaryButtonContentDescription(contentDescription);
+    }
+
+    /**
+     * Show/Hide the secondary button on the Toolbar.
+     * @param enabled true to show the button, otherwise it's hidden.
+     */
+    public void setSecondaryButtonEnabled(final boolean enabled) {
+        getToolbarDelegate().setSecondaryButtonEnabled(enabled);
+    }
+
+    /** Set the icon to the secondary button */
+    public void setSecondaryButtonIcon(final @DrawableRes int drawableRes) {
+        getToolbarDelegate().setSecondaryButtonIcon(this, drawableRes);
+    }
+
+    /** Set the OnClick listener to the secondary button */
+    public void setSecondaryButtonOnClickListener(final @Nullable View.OnClickListener listener) {
+        getToolbarDelegate().setSecondaryButtonOnClickListener(listener);
+    }
+
+    /** Set the content description to the secondary button */
+    public void setSecondaryButtonContentDescription(final @Nullable CharSequence contentDescription) {
+        getToolbarDelegate().setSecondaryButtonContentDescription(contentDescription);
+    }
+
     /**
      * Show/Hide the action button on the Toolbar.
      *
@@ -137,13 +190,46 @@ public void setSubtitle(final @StringRes int subtitleId) {
      * @param enabled {@code true} to show the button, otherwise it's hidden.
      */
     public void setActionButtonEnabled(final boolean enabled) {
-        mActionButton.ifPresent((v) ->
-                // Note that, the action button is wrapped by a parent view that has padding and we
-                // can't edit the layout in XML, so we want to hide it too to avoid empty spaces
-                ((View) v.getParent()).setVisibility(enabled ? View.VISIBLE : View.GONE));
         getToolbarDelegate().setActionButtonEnabled(enabled);
     }
 
+    /**
+     * Enable/Disable the action button on the Toolbar (being clickable or not).
+     * @param clickable true to enable the button, otherwise it's disabled.
+     */
+    public void setActionButtonClickable(final boolean clickable) {
+        getToolbarDelegate().setActionButtonClickable(clickable);
+    }
+
+    /** Set the icon to the action button */
+    public void setActionButtonIcon(final @DrawableRes int drawableRes) {
+        getToolbarDelegate().setActionButtonIcon(this, drawableRes);
+    }
+
+    /** Set the text to the action button */
+    public void setActionButtonText(final @Nullable CharSequence text) {
+        getToolbarDelegate().setActionButtonText(text);
+    }
+
+    /** Set the OnClick listener to the action button */
+    public void setActionButtonListener(final @Nullable View.OnClickListener listener) {
+        getToolbarDelegate().setActionButtonOnClickListener(listener);
+    }
+
+    /** Set the content description to the action button */
+    public void setActionButtonContentDescription(final @Nullable CharSequence contentDescription) {
+        getToolbarDelegate().setActionButtonContentDescription(contentDescription);
+    }
+
+    /**
+     * Show/Hide the Toolbar's trailing buttons (action/primary/secondary) view.
+     *
+     * @param enabled {@code true} to show the trailing buttons view, otherwise it's hidden.
+     */
+    public void setTrailingButtonsEnabled(final boolean enabled) {
+        mTrailingButtons.ifPresent((v) -> v.setVisibility(enabled ? View.VISIBLE : View.GONE));
+    }
+
     @Override
     public boolean onNavigateUp() {
         if (!super.onNavigateUp()) {