Merge "Hide preference when no app restricted" into pi-dev (1f02712e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,8 +72,8 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
		mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager);

		final int num = mAppInfos.size();
		// Enable the preference if some apps already been restricted, otherwise disable it
		preference.setEnabled(num > 0);
		// Don't show it if no app been restricted
		preference.setVisible(num > 0);
		preference.setSummary(
		mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
		num));

+4 −3

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ public class RestrictAppPreferenceControllerTest {
		}

		@Test
		public void testUpdateState_twoRestrictedAppsForPrimaryUser_showCorrectSummary() {
		public void testUpdateState_twoRestrictedAppsForPrimaryUser_visibleAndShowCorrectSummary() {
		mPackageOpsList.add(mRestrictedPackageOps);
		mPackageOpsList.add(mRestrictedPackageOps);
		mPackageOpsList.add(mAllowedPackageOps);
		@@ -135,6 +135,7 @@ public class RestrictAppPreferenceControllerTest {
		mRestrictAppPreferenceController.updateState(mPreference);

		assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 2 apps");
		assertThat(mPreference.isVisible()).isTrue();
		}

		@Test
		@@ -155,13 +156,13 @@ public class RestrictAppPreferenceControllerTest {
		}

		@Test
		public void testUpdateState_zeroRestrictApp_disabled() {
		public void testUpdateState_zeroRestrictApp_inVisible() {
		mPackageOpsList.add(mAllowedPackageOps);
		doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());

		mRestrictAppPreferenceController.updateState(mPreference);

		assertThat(mPreference.isEnabled()).isFalse();
		assertThat(mPreference.isVisible()).isFalse();
		}

		@Test