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

Commit 44386742 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Update battery content description. 

Ensure "battery" and "percent" are included.

Bug: 134035327
Test: make; enable talkback
Change-Id: I4c8a0a2c53333bc24b7075f19ca9ec4f9203167e
parent b26792a2

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -495,6 +495,9 @@ 
    <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level">Battery <xliff:g id="number">%d</xliff:g> percent.</string>



    <!-- Content description of the battery level icon for accessibility, including the estimated time remaining before the phone runs out of battery (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_with_estimate">Battery <xliff:g id="percentage" example="95%">%1$s</xliff:g> percent, about <xliff:g id="time" example="Until 3:15pm">%2$s</xliff:g> left based on your usage</string>



    <!-- Content description of the battery level icon for accessibility while the device is charging (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_battery_level_charging">Battery charging, <xliff:g id="battery_percentage">%d</xliff:g> percent.</string>

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

+2 −2
Original line number Diff line number Diff line
@@ -356,8 +356,8 @@ public class BatteryMeterView extends LinearLayout implements 
                    if (estimate != null) {

                        mBatteryPercentView.setText(estimate);

                        setContentDescription(getContext().getString(

                                R.string.battery_low_percent_format_hybrid, mLevel, estimate));



                                R.string.accessibility_battery_level_with_estimate,

                                mLevel, estimate));

                    } else {

                        setPercentTextAtCurrentLevel();

                    }