diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index fce8a65e215..7fdf8294cb9 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -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)); diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index 6a97fe187ff..7d26755deec 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -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