Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag" into tm-qpr-dev

Browse Source
This commit is contained in:
Beverly Tai
2023-03-01 20:25:06 +00:00
committed by Android (Google) Code Review
parent 4f6472c6c3 065f435e27
commit 30f403c264
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/flags.xml
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>

9
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
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