From 98fca32ddcaa2d2d1a75e417e403f174f714d343 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Mon, 5 Dec 2022 16:00:35 +0000 Subject: [PATCH] [Dock Defend] Update flag to be resource-backed so we can enable it on certain devices only. Fixes: 261156040 Bug: 255625888 Test: `adb shell am broadcast -a com.android.systemui.demo -e command battery -e overheated true` -> shield displays on titan but doesn't display on other devices Change-Id: I40c0d841ba0c8e1c41bbdb13abbaf0c0ef5125af --- packages/SystemUI/res/values/flags.xml | 4 ++++ packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml index 49dd574af8298..fd2e3249d59ac 100644 --- a/packages/SystemUI/res/values/flags.xml +++ b/packages/SystemUI/res/values/flags.xml @@ -36,4 +36,8 @@ avatar will no longer show on the lockscreen --> false + + false + diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 2ddac95bfc0a3..4732f06c1e8b0 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -222,7 +222,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 =