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

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

Merge "Add new FeatureFlagsClassic alias" into main

parents ba63ef90 048a82af

packages/SystemUI/src-debug/com/android/systemui/flags/FlagsModule.kt

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ import javax.inject.Named 
    SettingsUtilModule::class,

])

abstract class FlagsModule {

    @Binds

    abstract fun bindsFeatureFlagDebug(impl: FeatureFlagsDebug): FeatureFlags

    @Binds abstract fun bindsFeatureFlagDebug(impl: FeatureFlagsClassicDebug): FeatureFlagsClassic



    @Binds

    @IntoSet

packages/SystemUI/src-release/com/android/systemui/flags/FlagsModule.kt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import javax.inject.Named 
])

abstract class FlagsModule {

    @Binds

    abstract fun bindsFeatureFlagRelease(impl: FeatureFlagsRelease): FeatureFlags

    abstract fun bindsFeatureFlagRelease(impl: FeatureFlagsClassicRelease): FeatureFlagsClassic



    @Binds

    @IntoSet

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

+2 −2
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ constructor( 
    private var androidRestartRequested = false



    override fun restartSystemUI(reason: String) {

        Log.d(FeatureFlagsDebug.TAG, "SystemUI Restart requested. Restarting when idle.")

        Log.d(FeatureFlagsClassicDebug.TAG, "SystemUI Restart requested. Restarting when idle.")

        scheduleRestart(reason)

    }



    override fun restartAndroid(reason: String) {

        Log.d(FeatureFlagsDebug.TAG, "Android Restart requested. Restarting when idle.")

        Log.d(FeatureFlagsClassicDebug.TAG, "Android Restart requested. Restarting when idle.")

        androidRestartRequested = true

        scheduleRestart(reason)

    }

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

+16 −1
Original line number Diff line number Diff line
@@ -23,6 +23,21 @@ import android.util.Dumpable 
 *

 * See [Flags] for instructions on defining new flags.

 */

interface FeatureFlagsClassic : FeatureFlags



/**

 * Class to manage simple DeviceConfig-based feature flags.

 *

 * See [Flags] for instructions on defining new flags.

 */

@Deprecated(

    message = "Use FeatureFlagsClassic instead.",

    replaceWith =

        ReplaceWith(

            "FeatureFlagsClassic",

            "com.android.systemui.flags.FeatureFlagsClassic",

        ),

)

interface FeatureFlags : FlagListenable, Dumpable {

    /** Returns a boolean value for the given flag.  */

    fun isEnabled(flag: UnreleasedFlag): Boolean

packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java→packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsClassicDebug.java

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ import javax.inject.Named; 
 * To restore a flag back to its default, leave the `--ez value <0|1>` off of the command.

 */

@SysUISingleton

public class FeatureFlagsDebug implements FeatureFlags {

public class FeatureFlagsClassicDebug implements FeatureFlagsClassic {

    static final String TAG = "SysUIFlags";



    private final FlagManager mFlagManager;
@@ -116,7 +116,7 @@ public class FeatureFlagsDebug implements FeatureFlags { 
            };



    @Inject

    public FeatureFlagsDebug(

    public FeatureFlagsClassicDebug(

            FlagManager flagManager,

            Context context,

            GlobalSettings globalSettings,