Merge "Update the summary used when permission is fixed by admin." (45554ceb) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -228,12 +228,13 @@ public final class AppPermissionsFragment extends SettingsWithHeader
		android.R.attr.colorControlNormal));
		preference.setTitle(group.getLabel());
		if (group.isPolicyFixed()) {
		preference.setSummary(getString(R.string.permission_summary_enforced_by_policy));
		EnforcedAdmin admin =
		RestrictedLockUtils.getProfileOrDeviceOwnerOnCallingUser(context);
		if (admin != null) {
		preference.setDisabledByAdmin(admin);
		preference.setSummary(R.string.disabled_by_admin_summary_text);
		} else {
		preference.setSummary(R.string.permission_summary_enforced_by_policy);
		preference.setEnabled(false);
		}
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -229,11 +229,12 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
		if (!isTelevision && (existingPref instanceof RestrictedSwitchPreference)) {
		((RestrictedSwitchPreference) existingPref).setDisabledByAdmin(
		isPolicyFixed ? mEnforcedAdmin : null);
		existingPref.setSummary(R.string.disabled_by_admin_summary_text);
		} else {
		existingPref.setEnabled(!isPolicyFixed);
		}
		existingPref.setSummary(isPolicyFixed ?
		getString(R.string.permission_summary_enforced_by_policy) : null);
		}
		existingPref.setPersistent(false);
		if (existingPref instanceof SwitchPreference) {
		((SwitchPreference) existingPref)
		@@ -248,11 +249,12 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple
		pref.setIcon(app.getIcon());
		pref.setTitle(app.getLabel());
		if (app.isPolicyFixed()) {
		pref.setSummary(getString(R.string.permission_summary_enforced_by_policy));
		if (!isTelevision && mEnforcedAdmin != null) {
		pref.setDisabledByAdmin(mEnforcedAdmin);
		pref.setSummary(R.string.disabled_by_admin_summary_text);
		} else {
		pref.setEnabled(false);
		pref.setSummary(R.string.permission_summary_enforced_by_policy);
		}
		}
		pref.setPersistent(false);