diff options
| author | Alex Chau <alexchau@google.com> | 2015-07-06 16:14:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 16:14:43 +0000 |
| commit | fa14b80793711f72f190fef5a41228776b97e6a0 (patch) | |
| tree | 681b03ad5bf3676dcb4661e2c6d548bfdaad86ab /src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | |
| parent | 01fd766a6a53d62f772f0b9da32655977354f1eb (diff) | |
| parent | 97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf (diff) | |
| download | android_packages_apps_PackageInstaller-fa14b80793711f72f190fef5a41228776b97e6a0.tar.gz android_packages_apps_PackageInstaller-fa14b80793711f72f190fef5a41228776b97e6a0.tar.bz2 android_packages_apps_PackageInstaller-fa14b80793711f72f190fef5a41228776b97e6a0.zip | |
Merge "Display explanatory text in 'App permissions' settings when permissions policies are enforced" into mnc-dev
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index 483f6ba7..92ad7c8a 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -213,6 +213,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()); |