diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-01-28 10:29:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-28 10:29:23 +0000 |
| commit | 45554ceba3433d6c71694d30b25b37910a10ceab (patch) | |
| tree | 774cf1b23cff088f6eb6b28ab6f347f334414c8c | |
| parent | 4cdbfe3a930362eb095871b38edaa5f858d7dfc2 (diff) | |
| parent | b280ec310e8e49f13ed492204df9149cf62d2ee9 (diff) | |
| download | android_packages_apps_PackageInstaller-45554ceba3433d6c71694d30b25b37910a10ceab.tar.gz android_packages_apps_PackageInstaller-45554ceba3433d6c71694d30b25b37910a10ceab.tar.bz2 android_packages_apps_PackageInstaller-45554ceba3433d6c71694d30b25b37910a10ceab.zip | |
Merge "Update the summary used when permission is fixed by admin."
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java | 3 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java index d4dfca1e..364bcbdc 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java @@ -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); } } diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java index 550aaa92..1af28d67 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java @@ -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.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); |