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

Commit a8fe097b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support showing battery level chart first immediately after the battery... 

Merge "Support showing battery level chart first immediately after the battery level data is ready." into tm-qpr-dev am: baa3f3a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19753508



Change-Id: I19b929cca3d6c9f0b48fa8a29c2245ff92c88ffe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c232535 baa3f3a3

src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java

+4 −4
Original line number Diff line number Diff line
@@ -369,10 +369,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
            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 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
            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();