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

Commit d78a6147 authored by Jay Wang's avatar Jay Wang Committed by Automerger Merge Worker
Browse files

Merge "[Battery] Flip INCOMPATIBLE_CHARGING_BATTERY_ICON to droidfood." into... 

Merge "[Battery] Flip INCOMPATIBLE_CHARGING_BATTERY_ICON to droidfood." into udc-qpr-dev am: 38861f06

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



Change-Id: I965a817e642b07c788c1b9a49e99ce74bd9eccd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb607f9b 38861f06

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

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ object Flags { 


    // TODO(b/293863612): Tracking Bug

    @JvmField val INCOMPATIBLE_CHARGING_BATTERY_ICON =

        unreleasedFlag("incompatible_charging_battery_icon")

        releasedFlag("incompatible_charging_battery_icon")



    // TODO(b/293585143): Tracking Bug

    val INSTANT_TETHER = unreleasedFlag("instant_tether")