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

Commit 5d03e90a authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Modernize Lockscreen Clocks flag" into main

parents c8e56b59 127f9a8c

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -557,6 +557,13 @@ flag { 
   bug: "343495953"

}



flag {

   name: "lockscreen_custom_clocks"

   namespace: "systemui"

   description: "Enable lockscreen custom clocks"

   bug: "378486437"

}



flag {

   name: "faster_unlock_transition"

   namespace: "systemui"

packages/SystemUI/src/com/android/keyguard/dagger/ClockRegistryModule.java

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ public abstract class ClockRegistryModule { 
                scope,

                mainDispatcher,

                bgDispatcher,

                featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                com.android.systemui.Flags.lockscreenCustomClocks()

                        || featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                /* handleAllUsers= */ true,

                new DefaultClockProvider(

                        context,

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt

+3 −1
Original line number Diff line number Diff line
@@ -430,7 +430,9 @@ constructor( 
            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,

                value = featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                value =

                    com.android.systemui.Flags.lockscreenCustomClocks() ||

                        featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_WALLPAPER_FULLSCREEN_PREVIEW,