diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-03-03 18:26:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-03 18:26:46 +0000 |
commit | c5d544efee851227d9cfad18dd48a107d3b49d2f (patch) | |
tree | 459cc68c246b6f042dc3abc244f010fc0d2a8634 /src/com/android | |
parent | a31aa1b9339499006afc7cd25a03b96e0cca4d41 (diff) | |
parent | 0a32c002967e1205307c1e55090bfee9ef6ff133 (diff) | |
download | android_packages_apps_PackageInstaller-c5d544efee851227d9cfad18dd48a107d3b49d2f.tar.gz android_packages_apps_PackageInstaller-c5d544efee851227d9cfad18dd48a107d3b49d2f.tar.bz2 android_packages_apps_PackageInstaller-c5d544efee851227d9cfad18dd48a107d3b49d2f.zip |
Merge "Update restricted icon position in RestrictedSwitchPreference." into nyc-dev
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/PermissionAppsFragment.java | 3 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/RestrictedSwitchPreference.java | 17 |
2 files changed, 14 insertions, 6 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 ? diff --git a/src/com/android/packageinstaller/permission/ui/handheld/RestrictedSwitchPreference.java b/src/com/android/packageinstaller/permission/ui/handheld/RestrictedSwitchPreference.java index 8ab04807..44a7f471 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/RestrictedSwitchPreference.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/RestrictedSwitchPreference.java @@ -32,20 +32,26 @@ public class RestrictedSwitchPreference extends SwitchPreference { private final Context mContext; private boolean mDisabledByAdmin; private EnforcedAdmin mEnforcedAdmin; + private final int mSwitchWidgetResId; public RestrictedSwitchPreference(Context context) { super(context); + mSwitchWidgetResId = getWidgetLayoutResource(); mContext = context; } @Override public void onBindView(View view) { super.onBindView(view); - final TextView textView = (TextView) view.findViewById(android.R.id.title); - if (textView != null) { - RestrictedLockUtils.setTextViewPadlock(mContext, textView, mDisabledByAdmin); - if (mDisabledByAdmin) { - view.setEnabled(true); + if (mDisabledByAdmin) { + view.setEnabled(true); + } + if (mDisabledByAdmin) { + final TextView summaryView = (TextView) view.findViewById(android.R.id.summary); + if (summaryView != null) { + summaryView.setText( + isChecked() ? R.string.enabled_by_admin : R.string.disabled_by_admin); + summaryView.setVisibility(View.VISIBLE); } } } @@ -64,6 +70,7 @@ public class RestrictedSwitchPreference extends SwitchPreference { mEnforcedAdmin = admin; if (mDisabledByAdmin != disabled) { mDisabledByAdmin = disabled; + setWidgetLayoutResource(disabled ? R.layout.restricted_icon : mSwitchWidgetResId); setEnabled(!disabled); } } |