From 7839fe8322e91c22173c387b7791b2b7c63ece6d Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Fri, 14 Jun 2019 13:27:54 -0400
Subject: Fix battery content description when there is no percent mode

Fixes: 135157243
Test: can focus on status bar battery when talkback is on
Change-Id: I413ba6664bc651ddc378ae344fa42a17d460bfa5
---
 packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index f66463e4ef9b..ffa69fa87436 100644
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -365,6 +365,10 @@ public class BatteryMeterView extends LinearLayout implements
             } else {
                 setPercentTextAtCurrentLevel();
             }
+        } else {
+            setContentDescription(
+                    getContext().getString(mCharging ? R.string.accessibility_battery_level_charging
+                            : R.string.accessibility_battery_level, mLevel));
         }
     }
 
-- 
cgit v1.2.3-59-g8ed1b