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

Merge "Fix only one battery stat showing sometimes." into nyc-dev am: 7bcc48f77d am: a2f7a5980e

Browse Source 
am: 763f5c4411

* commit '763f5c4411223f4a3b544141b2ac7843467d56b7':
  Fix only one battery stat showing sometimes.

Change-Id: I68178af4d72ced2c914378f18b46a6dcdc36624e
This commit is contained in:
Jason Monk
2016-04-21 14:30:04 +00:00
committed by android-build-merger
parent 966781b295 763f5c4411
commit e8549595bb
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -399,6 +399,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
}
}
protected int getCachedCount() {
return mPreferenceCache.size();
}
private void highlightPreference(String key) {
final int position = canUseListViewForHighLighting(key);
if (position >= 0) {

9
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -368,7 +368,8 @@ public class PowerUsageSummary extends PowerUsageBase {
}
addedSome = true;
mAppListGroup.addPreference(pref);
if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST + 1)) {
if (mAppListGroup.getPreferenceCount() - getCachedCount()
> (MAX_ITEMS_TO_LIST + 1)) {
break;
}
}
@@ -391,8 +392,10 @@ public class PowerUsageSummary extends PowerUsageBase {
stats.add(new BatterySipper(type, null, use));
use += 5;
}
stats.add(new BatterySipper(DrainType.APP,
new FakeUid(Process.FIRST_APPLICATION_UID), use));
for (int i = 0; i < 100; i++) {
stats.add(new BatterySipper(DrainType.APP,
new FakeUid(Process.FIRST_APPLICATION_UID + i), use));
}
stats.add(new BatterySipper(DrainType.APP,
new FakeUid(0), use));