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

Merge "Move active unlock chipbar flag to a ResourceFlag" into tm-qpr-dev am: e22e369431

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

Change-Id: I1e2b92e3118357066372696c29ba632c8d1a1410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-12-16 17:24:26 +00:00
committed by Automerger Merge Worker
parent 98da67e031 e22e369431
commit a708760840
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/flags.xml
View File

@@ -30,6 +30,9 @@
<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>
<bool name="flag_smartspace">false</bool> <bool name="flag_smartspace">false</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

4
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -165,7 +165,9 @@ object Flags {
/** Shows chipbar UI whenever the device is unlocked by ActiveUnlock (watch). */ /** Shows chipbar UI whenever the device is unlocked by ActiveUnlock (watch). */
// TODO(b/256513609): Tracking Bug // TODO(b/256513609): Tracking Bug
@JvmField val ACTIVE_UNLOCK_CHIPBAR = releasedFlag(217, "active_unlock_chipbar") @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