commit aa4c25ed7500668cb44b9446c04b78a8e214fecb
author Evan Laird <evanlaird@google.com> Mon Jun 17 09:18:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jun 17 09:18:00 2019 -0700
tree 814267a0c4869eb3c0be0a407a856c0e35fe4d01
parent b199795653383c61a668056e1ecb1e30630a943c
parent 4f3e0aa4d3100f8e46b2ae30056a3acbada6e90a

Merge "Fix battery content description when there is no percent mode" into qt-dev
am: 4f3e0aa4d3

Change-Id: Ie7d97c927848deea326c4005d5359fed9d41e426

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index f66463e..ffa69fa 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -365,6 +365,10 @@
             } else {
                 setPercentTextAtCurrentLevel();
             }
+        } else {
+            setContentDescription(
+                    getContext().getString(mCharging ? R.string.accessibility_battery_level_charging
+                            : R.string.accessibility_battery_level, mLevel));
         }
     }