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

Commit 5316bb71 authored by Zaiyue Xue's avatar Zaiyue Xue
Browse files

Fix b/241885070: Unexpected texts moving when going back to battery usage page 

This bug is because two charts visibility were set to visible everytime
when entering the battery usage page. Only after loading the data and
refresh the UI, one of them could be hidden.

screen record after fix: https://drive.google.com/file/d/1zpynm8UX3XXunlD-WE1eyv6yenrVhAH5/view?usp=sharing&resourcekey=0-y79NYHcm8lgiNRbgy8SEfQ

Test: manual
Bug: 236101166
Bug: 241885070
Change-Id: I9c1dbf79a95dad2c3dece71af6d52f546d8a5808
parent 248895db

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

+9 −3
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ public class BatteryChartPreferenceControllerV2 extends AbstractPreferenceContro 
            mDailyTimestampFullTexts = null;

            mDailyViewModel = null;

            mHourlyViewModels = null;

            addFooterPreferenceIfNeeded(false);

            refreshUi();

            return;

        }

        mDailyTimestampFullTexts = generateTimestampDayOfWeekTexts(
@@ -338,14 +338,20 @@ public class BatteryChartPreferenceControllerV2 extends AbstractPreferenceContro 


    @VisibleForTesting

    boolean refreshUi() {

        if (mBatteryUsageMap == null || mDailyChartView == null || mHourlyChartView == null) {

        if (mDailyChartView == null || mHourlyChartView == null) {

            // Chart views are not initialized.

            return false;

        }



        if (mDailyViewModel == null || mHourlyViewModels == null) {

            // Fail to get battery level data, show an empty hourly chart view.

            mDailyChartView.setVisibility(View.GONE);

            mHourlyChartView.setVisibility(View.VISIBLE);

            mHourlyChartView.setViewModel(null);

            addFooterPreferenceIfNeeded(false);

            return false;

        }

        if (mBatteryUsageMap == null) {

            // Battery usage data is not ready, wait for data ready to refresh UI.

            return false;

        }

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

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ public class BatteryChartViewV2 extends AppCompatImageView implements View.OnCli 
        } else {

            mTextPaint = null;

        }

        setVisibility(View.VISIBLE);

        requestLayout();

    }