Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-09 11:12:55 +00:00
committed by Android (Google) Code Review
parent aaaed2f0c1 5316bb71fe
commit 8ebd4a5f8e
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2.java
View File

@@ -273,7 +273,7 @@ public class BatteryChartPreferenceControllerV2 extends AbstractPreferenceContro
mDailyTimestampFullTexts = null; mDailyTimestampFullTexts = null;
mDailyViewModel = null; mDailyViewModel = null;
mHourlyViewModels = null; mHourlyViewModels = null;
addFooterPreferenceIfNeeded(false); refreshUi();
return; return;
} }
mDailyTimestampFullTexts = generateTimestampDayOfWeekTexts( mDailyTimestampFullTexts = generateTimestampDayOfWeekTexts(
@@ -336,14 +336,20 @@ public class BatteryChartPreferenceControllerV2 extends AbstractPreferenceContro
@VisibleForTesting @VisibleForTesting
boolean refreshUi() { boolean refreshUi() {
if (mBatteryUsageMap == null || mDailyChartView == null || mHourlyChartView == null) { if (mDailyChartView == null || mHourlyChartView == null) {
// Chart views are not initialized.
return false; return false;
} }
if (mDailyViewModel == null || mHourlyViewModels == null) { if (mDailyViewModel == null || mHourlyViewModels == null) {
// Fail to get battery level data, show an empty hourly chart view. // Fail to get battery level data, show an empty hourly chart view.
mDailyChartView.setVisibility(View.GONE); mDailyChartView.setVisibility(View.GONE);
mHourlyChartView.setVisibility(View.VISIBLE);
mHourlyChartView.setViewModel(null); 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; return false;
} }

1
src/com/android/settings/fuelgauge/batteryusage/BatteryChartViewV2.java
View File

@@ -158,7 +158,6 @@ public class BatteryChartViewV2 extends AppCompatImageView implements View.OnCli
} else { } else {
mTextPaint = null; mTextPaint = null;
} }
setVisibility(View.VISIBLE);
requestLayout(); requestLayout();
} }