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

Commit 1371dbdb authored by Michael Mikhail's avatar Michael Mikhail
Browse files

Add aconfig flag for media refactor. 

Flag: ACONFIG media_controls_refactor DISABLED
Bug: 326408371
Test: atest SystemUITests
Change-Id: I81899c405dc25014fbaf80c8514067638e17d461
parent d228bcd8

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -563,3 +563,10 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "media_controls_refactor"

    namespace: "systemui"

    description: "Refactors media code to follow the recommended architecture"

    bug: "326408371"

}

packages/SystemUI/src/com/android/systemui/media/controls/util/MediaControlsRefactorFlag.kt

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.media.controls.util



import com.android.systemui.Flags

import com.android.systemui.flags.FlagToken

import com.android.systemui.flags.RefactorFlagUtils



/** Helper for reading or using the media_controls_refactor flag state. */

@Suppress("NOTHING_TO_INLINE")

object MediaControlsRefactorFlag {

    /** The aconfig flag name */

    const val FLAG_NAME = Flags.FLAG_MEDIA_CONTROLS_REFACTOR



    /** A token used for dependency declaration */

    val token: FlagToken

        get() = FlagToken(FLAG_NAME, isEnabled)



    /** Is the flag enabled? */

    @JvmStatic

    inline val isEnabled

        get() = Flags.mediaControlsRefactor()



    /**

     * Called to ensure code is only run when the flag is enabled. This protects users from the

     * unintended behaviors caused by accidentally running new logic, while also crashing on an eng

     * build to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun isUnexpectedlyInLegacyMode() =

        RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)



    /**

     * Called to ensure code is only run when the flag is disabled. This will throw an exception if

     * the flag is enabled to ensure that the refactor author catches issues in testing.

     */

    @JvmStatic

    inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)

}

packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt

+3 −0
Original line number Diff line number Diff line
@@ -58,4 +58,7 @@ constructor( 
    /** Check whether to use scene framework */

    fun isSceneContainerEnabled() =

        sceneContainerFlags.isEnabled() && MediaInSceneContainerFlag.isEnabled



    /** Check whether to use media refactor code */

    fun isMediaControlsRefactorEnabled() = MediaControlsRefactorFlag.isEnabled

}