commit 4f3e0aa4d3100f8e46b2ae30056a3acbada6e90a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 17 15:24:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 17 15:24:44 2019 +0000
tree a723c6b43f6d083469faedcdf5e12ab6052f07e4
parent 08793a3b646c8335feeb9f82d8cfe4df1bcf01fb
parent 7839fe8322e91c22173c387b7791b2b7c63ece6d

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

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));
         }
     }