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

Merge "[Dock Defend] Update flag to be resource-backed so we can enable it on certain devices only." into tm-qpr-dev am: d9c890d925

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

Change-Id: Iafe7a529902abfd58d1877d6efa160cb50b1d74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-06 17:31:14 +00:00
committed by Automerger Merge Worker
parent 2279b3a10f d9c890d925
commit 0c81510994
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,4 +36,8 @@
avatar will no longer show on the lockscreen -->
<bool name="flag_user_switcher_chip">false</bool>
<!-- Whether the battery icon is allowed to display a shield when battery life is being
protected. -->
<bool name="flag_battery_shield_icon">false</bool>
</resources>

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

@@ -229,7 +229,9 @@ object Flags {
val NEW_STATUS_BAR_WIFI_ICON_BACKEND = unreleasedFlag(609, "new_status_bar_wifi_icon_backend")
// TODO(b/256623670): Tracking Bug
@JvmField val BATTERY_SHIELD_ICON = unreleasedFlag(610, "battery_shield_icon")
@JvmField
val BATTERY_SHIELD_ICON =
resourceBooleanFlag(610, R.bool.flag_battery_shield_icon, "battery_shield_icon")
// TODO(b/260881289): Tracking Bug
val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =