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

Merge "Hide preference when no app restricted" into pi-dev

Browse Source 
am: 1f02712e7a

Change-Id: I6cabb95f74b21841874cb7bd710aefb04db078f0
This commit is contained in:
Lei Yu
2018-04-10 12:03:56 -07:00
committed by android-build-merger
parent c767f493d8 1f02712e7a
commit 1b82df6906
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
View File

@@ -72,8 +72,8 @@ public class RestrictAppPreferenceController extends BasePreferenceController {
mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager); mAppInfos = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager);
final int num = mAppInfos.size(); final int num = mAppInfos.size();
// Enable the preference if some apps already been restricted, otherwise disable it // Don't show it if no app been restricted
preference.setEnabled(num > 0); preference.setVisible(num > 0);
preference.setSummary( preference.setSummary(
mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num, mContext.getResources().getQuantityString(R.plurals.restricted_app_summary, num,
num)); num));

7
tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
View File

@@ -125,7 +125,7 @@ public class RestrictAppPreferenceControllerTest {
} }
@Test @Test
public void testUpdateState_twoRestrictedAppsForPrimaryUser_showCorrectSummary() { public void testUpdateState_twoRestrictedAppsForPrimaryUser_visibleAndShowCorrectSummary() {
mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mRestrictedPackageOps); mPackageOpsList.add(mRestrictedPackageOps);
mPackageOpsList.add(mAllowedPackageOps); mPackageOpsList.add(mAllowedPackageOps);
@@ -135,6 +135,7 @@ public class RestrictAppPreferenceControllerTest {
mRestrictAppPreferenceController.updateState(mPreference); mRestrictAppPreferenceController.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 2 apps"); assertThat(mPreference.getSummary()).isEqualTo("Limiting battery usage for 2 apps");
assertThat(mPreference.isVisible()).isTrue();
} }
@Test @Test
@@ -155,13 +156,13 @@ public class RestrictAppPreferenceControllerTest {
} }
@Test @Test
public void testUpdateState_zeroRestrictApp_disabled() { public void testUpdateState_zeroRestrictApp_inVisible() {
mPackageOpsList.add(mAllowedPackageOps); mPackageOpsList.add(mAllowedPackageOps);
doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any()); doReturn(mPackageOpsList).when(mAppOpsManager).getPackagesForOps(any());
mRestrictAppPreferenceController.updateState(mPreference); mRestrictAppPreferenceController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isFalse(); assertThat(mPreference.isVisible()).isFalse();
} }
@Test @Test