summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Silva <lusilva@google.com> 2023-05-12 20:32:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-12 20:32:22 +0000
commit3090ffdceb35bc536dace715bf96699f3d97855e (patch)
tree3b1f6acbde66166b0ad7a37ccd3539e15f99709b
parent4fca5c41481643afc6494b59a1d397f3601df1aa (diff)
parenta29dfab3e5c25df627cf6a4bee87c4f5a391f8b1 (diff)
Merge "Update custom clock flag to a resource" into udc-dev
-rw-r--r--packages/SystemUI/res-keyguard/values/config.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/flags/Flags.kt7
2 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/res-keyguard/values/config.xml b/packages/SystemUI/res-keyguard/values/config.xml
index a25ab5109fa8..d50355140bed 100644
--- a/packages/SystemUI/res-keyguard/values/config.xml
+++ b/packages/SystemUI/res-keyguard/values/config.xml
@@ -28,6 +28,8 @@
<!-- Will display the bouncer on one side of the display, and the current user icon and
user switcher on the other side -->
<bool name="config_enableBouncerUserSwitcher">false</bool>
+ <!-- Will enable custom clocks on the lockscreen -->
+ <bool name="config_enableLockScreenCustomClocks">true</bool>
<!-- Time to be considered a consecutive fingerprint failure in ms -->
<integer name="fp_consecutive_failure_time_ms">3500</integer>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index 18c4f6073206..4bdfc7e3c1b1 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -120,7 +120,12 @@ object Flags {
resourceBooleanFlag(204, R.bool.config_enableBouncerUserSwitcher, "bouncer_user_switcher")
// TODO(b/254512676): Tracking Bug
- @JvmField val LOCKSCREEN_CUSTOM_CLOCKS = releasedFlag(207, "lockscreen_custom_clocks")
+ @JvmField
+ val LOCKSCREEN_CUSTOM_CLOCKS = resourceBooleanFlag(
+ 207,
+ R.bool.config_enableLockScreenCustomClocks,
+ "lockscreen_custom_clocks"
+ )
// TODO(b/275694445): Tracking Bug
@JvmField