diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-03-01 18:42:39 -0800 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2016-03-02 10:51:49 -0800 |
| commit | 0a32c002967e1205307c1e55090bfee9ef6ff133 (patch) | |
| tree | bf2ee90d947abadc3d03669bdac98a58e7ea9e9d /src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java | |
| parent | 4b312d62036ebacbfe95b92e2470ab5f3f1eb81b (diff) | |
| download | android_packages_apps_PackageInstaller-0a32c002967e1205307c1e55090bfee9ef6ff133.tar.gz android_packages_apps_PackageInstaller-0a32c002967e1205307c1e55090bfee9ef6ff133.tar.bz2 android_packages_apps_PackageInstaller-0a32c002967e1205307c1e55090bfee9ef6ff133.zip | |
Update restricted icon position in RestrictedSwitchPreference.
And fixed a bug where the admin disabled summary is shown even
if the admin has not set a permission policy.
Bug: 25603665
Bug: 27263775
Change-Id: I8cbbc4c326669a656ad5aef53896b388d556a74f
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java index ccf864fb..0f616361 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java @@ -228,7 +228,8 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple if (!isTelevision && (existingPref instanceof RestrictedSwitchPreference)) { ((RestrictedSwitchPreference) existingPref).setDisabledByAdmin( isPolicyFixed ? enforcedAdmin : null); - existingPref.setSummary(R.string.disabled_by_admin_summary_text); + existingPref.setSummary(isPolicyFixed ? + getString(R.string.disabled_by_admin_summary_text) : null); } else { existingPref.setEnabled(!isPolicyFixed); existingPref.setSummary(isPolicyFixed ? |