summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Mikhail <michaelmikhil@google.com> 2024-05-20 18:41:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-05-20 18:41:37 +0000
commitbcd8e5e3f772cc951587280d2c7c9d111853b51e (patch)
treef0ca412aa91acceb3b3a11d2cb6a69c724fa5b0f
parentb8e224dcad878b9fbc6fc2457dddb99d7f60eaf2 (diff)
parent5f50ebfe0d27c0ea19457af4d24cf9a31ae7ed42 (diff)
Merge "Flag media controls refactor with flexiglass flag" into main
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt
index 6a6eba163a40..1e7bc0cacf1d 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt
@@ -54,5 +54,6 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlagsClass
fun isSceneContainerEnabled() = SceneContainerFlag.isEnabled
/** Check whether to use media refactor code */
- fun isMediaControlsRefactorEnabled() = MediaControlsRefactorFlag.isEnabled
+ fun isMediaControlsRefactorEnabled() =
+ MediaControlsRefactorFlag.isEnabled && SceneContainerFlag.isEnabled
}