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

Commit f7e95e04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move clock flags to shared lib" into main

parents 89a24ecd acbc2c06

packages/SystemUI/aconfig/systemui.aconfig

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

   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 {

flag {

   name: "faster_unlock_transition"

   name: "faster_unlock_transition"

   namespace: "systemui"

   namespace: "systemui"

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -62,15 +62,14 @@ public abstract class ClockRegistryModule { 
                scope,

                scope,

                mainDispatcher,

                mainDispatcher,

                bgDispatcher,

                bgDispatcher,

                com.android.systemui.Flags.lockscreenCustomClocks()

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

                        || featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                        || featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                /* handleAllUsers= */ true,

                /* handleAllUsers= */ true,

                new DefaultClockProvider(

                new DefaultClockProvider(

                        context,

                        context,

                        layoutInflater,

                        layoutInflater,

                        resources,

                        resources,



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

                        com.android.systemui.Flags.clockReactiveVariants()

                ),

                ),

                context.getString(R.string.lockscreen_clock_id_fallback),

                context.getString(R.string.lockscreen_clock_id_fallback),

                clockBuffers,

                clockBuffers,

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

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

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_CLOCKS_ENABLED,

                value =

                value =

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

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

                        featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

                        featureFlags.isEnabled(Flags.LOCKSCREEN_CUSTOM_CLOCKS),

            ),

            ),

            KeyguardPickerFlag(

            KeyguardPickerFlag(