Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f1e476c authored by Lucas Silva's avatar Lucas Silva Committed by Automerger Merge Worker
Browse files

Merge "Update custom clock flag to a resource" into udc-dev am: 3090ffdc am:... 

Merge "Update custom clock flag to a resource" into udc-dev am: 3090ffdc am: 12e541f4 am: c6e91f63

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23177575



Change-Id: Id35f8520d54984f55ce6ba8a439aeb5c2dd090c0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc16baec c6e91f63

packages/SystemUI/res-keyguard/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+6 −1
Original line number Diff line number Diff line
@@ -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