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

Commit acbc2c06 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Move clock flags to shared lib 

Test: N/A
Bug: 391858282
Flag: com.android.systemui.shared.lockscreen_custom_clocks
Flag: com.android.systemui.shared.clock_reactive_variants
Change-Id: I82342adf847c860ec8b4aef715cea50002a9d43b
parent b0c0ea9b

packages/SystemUI/aconfig/systemui.aconfig

+0 −14
Original line number Diff line number Diff line
@@ -564,20 +564,6 @@ flag { 
   bug: "305049544"

}



flag {

   name: "clock_reactive_variants"

   namespace: "systemui"

   description: "Add reactive variant fonts to some clocks"

   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 −3
Original line number Diff line number Diff line
@@ -62,15 +62,14 @@ public abstract class ClockRegistryModule { 
                scope,

                mainDispatcher,

                bgDispatcher,

                com.android.systemui.Flags.lockscreenCustomClocks()

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

                        || featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                /* handleAllUsers= */ true,

                new DefaultClockProvider(

                        context,

                        layoutInflater,

                        resources,



                        com.android.systemui.Flags.clockReactiveVariants()

                        com.android.systemui.shared.Flags.clockReactiveVariants()

                ),

                context.getString(R.string.lockscreen_clock_id_fallback),

                clockBuffers,

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

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ constructor( 
            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,

                value =

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

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

                        featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

            ),

            KeyguardPickerFlag(