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>
This commit is contained in:
@@ -369,10 +369,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
|
|||||||
addFooterPreferenceIfNeeded(false);
|
addFooterPreferenceIfNeeded(false);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (mBatteryUsageMap == null) {
|
|
||||||
// Battery usage data is not ready, wait for data ready to refresh UI.
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isBatteryLevelDataInOneDay()) {
|
if (isBatteryLevelDataInOneDay()) {
|
||||||
// Only 1 day data, hide the daily chart view.
|
// Only 1 day data, hide the daily chart view.
|
||||||
@@ -394,6 +390,10 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
|
|||||||
mHourlyChartView.setViewModel(hourlyViewModel);
|
mHourlyChartView.setViewModel(hourlyViewModel);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mBatteryUsageMap == null) {
|
||||||
|
// Battery usage data is not ready, wait for data ready to refresh UI.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
mHandler.post(() -> {
|
mHandler.post(() -> {
|
||||||
final long start = System.currentTimeMillis();
|
final long start = System.currentTimeMillis();
|
||||||
removeAndCacheAllPrefs();
|
removeAndCacheAllPrefs();
|
||||||
|
Reference in New Issue
Block a user