PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Init the pref summary in onCreate()" into oc-mr1-dev

Browse Source 
am: 7420c095a9

Change-Id: I3b06886495ba3ec6277c84051bee4974c004c9a1
This commit is contained in:
jackqdyulei
2017-09-13 08:39:31 +00:00
committed by android-build-merger
parent 5bf7af0154 7420c095a9
commit 55b71cf230
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
View File

@@ -124,6 +124,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
mPackageManager = context.getPackageManager(); mPackageManager = context.getPackageManager();
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mBatteryUtils = BatteryUtils.getInstance(context); mBatteryUtils = BatteryUtils.getInstance(context);
// init the summary so other preferences won't have unnecessary move
updateHistPrefSummary(context);
} }
@Override @Override
@@ -175,7 +178,13 @@ public class PowerUsageAdvanced extends PowerUsageBase {
} }
updatePreference(mHistPref); updatePreference(mHistPref);
refreshPowerUsageDataList(mStatsHelper, mUsageListGroup); refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);
updateHistPrefSummary(context);
BatteryEntry.startRequestQueue();
BatteryUtils.logRuntime(TAG, "refreshUI", startTime);
}
private void updateHistPrefSummary(Context context) {
Intent batteryIntent = Intent batteryIntent =
context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0; final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
@@ -186,9 +195,6 @@ public class PowerUsageAdvanced extends PowerUsageBase {
} else { } else {
mHistPref.hideBottomSummary(); mHistPref.hideBottomSummary();
} }
BatteryEntry.startRequestQueue();
BatteryUtils.logRuntime(TAG, "refreshUI", startTime);
} }
@VisibleForTesting @VisibleForTesting