RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag am: 065f435e27

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21651384

Change-Id: I564ae62098d5309427eed426a9c9f727d341588c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly
2023-03-01 20:44:04 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 11 deletions

View File

@@ -30,9 +30,6 @@
<bool name="flag_charging_ripple">false</bool> <bool name="flag_charging_ripple">false</bool>
<!-- Whether to show chipbar UI whenever the device is unlocked by ActiveUnlock. -->
<bool name="flag_active_unlock_chipbar">true</bool>
<!-- Whether the user switcher chip shows in the status bar. When true, the multi user <!-- Whether the user switcher chip shows in the status bar. When true, the multi user
avatar will no longer show on the lockscreen --> avatar will no longer show on the lockscreen -->
<bool name="flag_user_switcher_chip">false</bool> <bool name="flag_user_switcher_chip">false</bool>

View File

@@ -157,12 +157,6 @@ object Flags {
val CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES = val CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES =
unreleasedFlag(216, "customizable_lock_screen_quick_affordances", teamfood = true) unreleasedFlag(216, "customizable_lock_screen_quick_affordances", teamfood = true)
/** Shows chipbar UI whenever the device is unlocked by ActiveUnlock (watch). */
// TODO(b/256513609): Tracking Bug
@JvmField
val ACTIVE_UNLOCK_CHIPBAR =
resourceBooleanFlag(217, R.bool.flag_active_unlock_chipbar, "active_unlock_chipbar")
/** /**
* Migrates control of the LightRevealScrim's reveal effect and amount from legacy code to the * Migrates control of the LightRevealScrim's reveal effect and amount from legacy code to the
* new KeyguardTransitionRepository. * new KeyguardTransitionRepository.
@@ -272,8 +266,7 @@ object Flags {
/** Enables new QS Edit Mode visual refresh */ /** Enables new QS Edit Mode visual refresh */
// TODO(b/269787742): Tracking Bug // TODO(b/269787742): Tracking Bug
@JvmField @JvmField
val ENABLE_NEW_QS_EDIT_MODE = val ENABLE_NEW_QS_EDIT_MODE = unreleasedFlag(510, "enable_new_qs_edit_mode", teamfood = false)
unreleasedFlag(510, "enable_new_qs_edit_mode", teamfood = false)
// 600- status bar // 600- status bar