summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Darrell Shi <darrellshi@google.com> 2024-02-28 16:52:17 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-02-28 16:52:17 +0000
commit5642f2e026bdd05922a0e3ede7f65b33a834548f (patch)
treee8411b0f7f3fa8ef533f65ca4c5a45e8a73c4120
parentf85fac6cc3cba327a1d20318051cb62bfb075409 (diff)
parentae0189d45d77466c7c7a465d601e8da4529fecf7 (diff)
Merge "Make communal_hub flag dependent on migrate_clocks_to_blueprint" into main
-rw-r--r--packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt7
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt b/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt
index 7a24d7693035..298da1359728 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt
@@ -22,8 +22,10 @@ import com.android.server.notification.Flags.FLAG_VIBRATE_WHILE_UNLOCKED
import com.android.server.notification.Flags.crossAppPoliteNotifications
import com.android.server.notification.Flags.politeNotifications
import com.android.server.notification.Flags.vibrateWhileUnlocked
+import com.android.systemui.Flags.FLAG_COMMUNAL_HUB
import com.android.systemui.Flags.FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR
import com.android.systemui.Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT
+import com.android.systemui.Flags.communalHub
import com.android.systemui.Flags.keyguardBottomAreaRefactor
import com.android.systemui.Flags.migrateClocksToBlueprint
import com.android.systemui.dagger.SysUISingleton
@@ -58,6 +60,9 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha
// ComposeLockscreen dependencies
ComposeLockscreen.token dependsOn keyguardBottomAreaRefactor
ComposeLockscreen.token dependsOn migrateClocksToBlueprint
+
+ // CommunalHub dependencies
+ communalHub dependsOn migrateClocksToBlueprint
}
private inline val politeNotifications
@@ -70,4 +75,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha
get() = FlagToken(FLAG_KEYGUARD_BOTTOM_AREA_REFACTOR, keyguardBottomAreaRefactor())
private inline val migrateClocksToBlueprint
get() = FlagToken(FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT, migrateClocksToBlueprint())
+ private inline val communalHub
+ get() = FlagToken(FLAG_COMMUNAL_HUB, communalHub())
}