Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9c890d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dock Defend] Update flag to be resource-backed so we can enable it on... 

Merge "[Dock Defend] Update flag to be resource-backed so we can enable it on certain devices only." into tm-qpr-dev
parents 71d3dbf2 98fca32d

packages/SystemUI/res/values/flags.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -36,4 +36,8 @@ 
      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>





    <!-- 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>
 
</resources>

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+3 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,9 @@ object Flags { 
    val NEW_STATUS_BAR_WIFI_ICON_BACKEND = unreleasedFlag(609, "new_status_bar_wifi_icon_backend")

    val NEW_STATUS_BAR_WIFI_ICON_BACKEND = unreleasedFlag(609, "new_status_bar_wifi_icon_backend")





    // TODO(b/256623670): Tracking Bug

    // 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

    // TODO(b/260881289): Tracking Bug

    val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =

    val NEW_STATUS_BAR_ICONS_DEBUG_COLORING =