diff options
| author | Alex Chau <alexchau@google.com> | 2015-07-01 16:55:30 +0100 |
|---|---|---|
| committer | Alex Chau <alexchau@google.com> | 2015-07-03 12:21:42 +0100 |
| commit | 97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf (patch) | |
| tree | 99c9075d8ad5b0dd7e172ad0a266b8a0252bfd2d /src | |
| parent | 6b9b05aedc983db8f657860de693ac94689c9b96 (diff) | |
| download | android_packages_apps_PackageInstaller-97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf.tar.gz android_packages_apps_PackageInstaller-97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf.tar.bz2 android_packages_apps_PackageInstaller-97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf.zip | |
Display explanatory text in 'App permissions' settings when permissions policies are enforced
"Enforced by policy" is shown in summary when permissions are
enforced by policy, in both permission grouped by app and app grouped by
permission screen
Bug: 22195440
Change-Id: I3a6e0eae43e0ddf07bbeb43c968c3422b6e6a13b
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | 3 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index d88b9adc..b291f582 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -235,6 +235,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader preference.setIcon(Utils.applyTint(getContext(), icon, android.R.attr.colorControlNormal)); preference.setTitle(group.getLabel()); + if (group.isPolicyFixed()) { + preference.setSummary(getString(R.string.permission_summary_enforced_by_policy)); + } preference.setPersistent(false); preference.setEnabled(!group.isPolicyFixed()); preference.setChecked(group.areRuntimePermissionsGranted()); diff --git a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java index ae7560e8..e843b0cb 100644 --- a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java @@ -208,6 +208,9 @@ public final class PermissionAppsFragment extends PreferenceFragment implements pref.setKey(app.getKey()); pref.setIcon(app.getIcon()); pref.setTitle(app.getLabel()); + if (app.isPolicyFixed()) { + pref.setSummary(getString(R.string.permission_summary_enforced_by_policy)); + } pref.setPersistent(false); pref.setEnabled(!app.isPolicyFixed()); preferences.addPreference(pref); |