Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add battery estimate to content description." into qt-dev

Browse Source 
am: 0fbcf57edf

Change-Id: I743c4d4ad85f58c3c80c36be659975b679f4bc69
This commit is contained in:
Amin Shaikh
2019-05-29 14:24:53 -07:00
committed by android-build-merger
parent f0df748db6 0fbcf57edf
commit 406f8ac491
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
View File

@@ -322,9 +322,6 @@ public class BatteryMeterView extends LinearLayout implements
mCharging = pluggedIn;
mLevel = level;
updatePercentText();
setContentDescription(
getContext().getString(charging ? R.string.accessibility_battery_level_charging
: R.string.accessibility_battery_level, level));
}
@Override
@@ -358,6 +355,9 @@ public class BatteryMeterView extends LinearLayout implements
mBatteryController.getEstimatedTimeRemainingString((String estimate) -> {
if (estimate != null) {
mBatteryPercentView.setText(estimate);
setContentDescription(getContext().getString(
R.string.battery_low_percent_format_hybrid, mLevel, estimate));
} else {
setPercentTextAtCurrentLevel();
}
@@ -371,6 +371,9 @@ public class BatteryMeterView extends LinearLayout implements
private void setPercentTextAtCurrentLevel() {
mBatteryPercentView.setText(
NumberFormat.getPercentInstance().format(mLevel / 100f));
setContentDescription(
getContext().getString(mCharging ? R.string.accessibility_battery_level_charging
: R.string.accessibility_battery_level, mLevel));
}
private void updateShowPercent() {