Merge "Change all the system items unclickable in battery usage list." (3eabebb7) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -272,8 +272,8 @@ public class BatteryDiffEntry {

		@VisibleForTesting
		void updateRestrictionFlagState() {
		mValidForRestriction = true;
		if (!mBatteryHistEntry.isAppEntry()) {
		mValidForRestriction = false;
		return;
		}
		final boolean isValidPackage =

+4 −4

Original line number	Diff line number	Diff line
		@@ -168,8 +168,8 @@ public final class BatteryDiffEntryTest {
		assertThat(nameAndIcon.mName).isEqualTo(expectedName);
		assertThat(nameAndIcon.mIconId).isEqualTo(R.drawable.ic_settings_aod);
		// Verifies the restrictable flag in the cache.
		assertThat(entry.mValidForRestriction).isTrue();
		assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue();
		assertThat(entry.mValidForRestriction).isFalse();
		assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isFalse();
		}

		@Test
		@@ -194,8 +194,8 @@ public final class BatteryDiffEntryTest {
		assertThat(nameAndIcon.mName).isEqualTo(expectedName);
		assertThat(nameAndIcon.mIconId).isEqualTo(0);
		// Verifies the restrictable flag in the cache.
		assertThat(entry.mValidForRestriction).isTrue();
		assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isTrue();
		assertThat(entry.mValidForRestriction).isFalse();
		assertThat(BatteryDiffEntry.sValidForRestriction.get(entry.getKey())).isFalse();
		}

		@Test