| commit | a8fe097b6a0b620041ba29055152a7ed45b0078e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 30 06:38:39 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 30 06:38:39 2022 +0000 |
| tree | 62e6f6d01ff88387ff1c58443acd0ffaf9ca72ab | |
| parent | 8c232535cf7bcd6f8ca7fe76abfd4613973c335f [diff] | |
| parent | baa3f3a3c642eb3b0b937a44b82a5f16e826da28 [diff] |
Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508 Change-Id: I19b929cca3d6c9f0b48fa8a29c2245ff92c88ffe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java index f3fec8e..6d2c1a1 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -369,10 +369,6 @@ addFooterPreferenceIfNeeded(false); return false; } - if (mBatteryUsageMap == null) { - // Battery usage data is not ready, wait for data ready to refresh UI. - return false; - } if (isBatteryLevelDataInOneDay()) { // Only 1 day data, hide the daily chart view. @@ -394,6 +390,10 @@ mHourlyChartView.setViewModel(hourlyViewModel); } + if (mBatteryUsageMap == null) { + // Battery usage data is not ready, wait for data ready to refresh UI. + return false; + } mHandler.post(() -> { final long start = System.currentTimeMillis(); removeAndCacheAllPrefs();