commit ecae840f917c915aa8f5f06b215f31edab0c6f0f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 22 23:25:42 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 22 23:25:42 2024 +0000
tree dd010a71f02bcbea2f1c934084b0dbf57cdea7e3
parent 32c2d9d1f73a16ee7b6177fdd2a53c1c0b8a065d
parent 893cda8ca66e668648bf3bc8ece08e062fb2b85c

Snap for 12537680 from 893cda8ca66e668648bf3bc8ece08e062fb2b85c to 25Q1-release

Change-Id: I7e2c9f9de20bd8ae72b9a3e9bd90061c66a4350d

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 07b2800..5643351 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,7 +101,7 @@
     <string name="grid_title">App grid</string>
 
     <!-- Title of a section of the customization picker where the user can select app shapes and
-        grid layouts for the home screen. [CHAR LIMIT=15] -->
+        grid layouts for the home screen. [CHAR LIMIT=32] -->
     <string name="shape_and_grid_title">App shape &amp; layout</string>
 
     <!-- Tab title that switch to app grid customization section, where people can customization

src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt

diff --git a/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt b/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt
index 652ffdd..15d9088 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockRegistryProvider.kt
@@ -19,6 +19,7 @@
 import android.content.ComponentName
 import android.content.Context
 import android.view.LayoutInflater
+import com.android.systemui.Flags
 import com.android.systemui.plugins.Plugin
 import com.android.systemui.plugins.PluginManager
 import com.android.systemui.shared.clocks.ClockRegistry
@@ -52,7 +53,12 @@
             backgroundDispatcher,
             isEnabled = true,
             handleAllUsers = false,
-            DefaultClockProvider(context, LayoutInflater.from(context), context.resources),
+            DefaultClockProvider(
+                ctx = context,
+                layoutInflater = LayoutInflater.from(context),
+                resources = context.resources,
+                isClockReactiveVariantsEnabled = Flags.clockReactiveVariants(),
+            ),
             keepAllLoaded = true,
             subTag = "Picker",
         )