diff options
| author | Evan Laird <evanlaird@google.com> | 2019-03-06 18:09:20 -0500 |
|---|---|---|
| committer | Evan Laird <evanlaird@google.com> | 2019-03-06 20:41:37 -0500 |
| commit | 85ee4a3cdf8bb0f238fb9a71ce10cfcbe08e124a (patch) | |
| tree | 0041289609551bd4d3f7cfd2aa074d30ffea368c /packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | |
| parent | 9a3c1f1dfe539aca83bd05f4269553b588dba664 (diff) | |
Always show time remaining estimate string in QS
QS will always show the time remaining estimate string, unless charging
or the estimate is unavailable
Test: visual
Fixes: 127519046
Change-Id: Iaa268ce631d3196967748b7f562d26e19ddeb465
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/BatteryMeterView.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/BatteryMeterView.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index 592b6039d69d..39a584272585 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -355,15 +355,23 @@ public class BatteryMeterView extends LinearLayout implements if (mBatteryPercentView != null) { if (mShowPercentMode == MODE_ESTIMATE && !mCharging) { mBatteryController.getEstimatedTimeRemainingString((String estimate) -> { - mBatteryPercentView.setText(estimate); + if (estimate != null) { + mBatteryPercentView.setText(estimate); + } else { + setPercentTextAtCurrentLevel(); + } }); } else { - mBatteryPercentView.setText( - NumberFormat.getPercentInstance().format(mLevel / 100f)); + setPercentTextAtCurrentLevel(); } } } + private void setPercentTextAtCurrentLevel() { + mBatteryPercentView.setText( + NumberFormat.getPercentInstance().format(mLevel / 100f)); + } + private void updateShowPercent() { final boolean showing = mBatteryPercentView != null; final boolean systemSetting = 0 != Settings.System |