commit b0a4c897ac624f275cca392183993ac51a0e3b2a
author Tony Mak <tonymak@google.com> Wed Jul 06 09:01:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 06 09:01:37 2016 +0000
tree 112d350717617050c6e0deade3772dcdb986c3f9
parent 45215ab25ba599a360d72500b2b95e3e6bafab8f
parent 1e25ba3ed1196d51c502c8e0d53dc0d6f23ed974

Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev

src/com/android/settings/RestrictedListPreference.java

diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java
index 521b698..25d4fc9 100644
--- a/src/com/android/settings/RestrictedListPreference.java
+++ b/src/com/android/settings/RestrictedListPreference.java
@@ -46,6 +46,7 @@
 
     public RestrictedListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setWidgetLayoutResource(R.layout.restricted_icon);
         mHelper = new RestrictedPreferenceHelper(context, this, attrs);
     }
 
@@ -59,6 +60,10 @@
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
         mHelper.onBindViewHolder(holder);
+        final View restrictedIcon = holder.findViewById(R.id.restricted_icon);
+        if (restrictedIcon != null) {
+            restrictedIcon.setVisibility(isDisabledByAdmin() ? View.VISIBLE : View.GONE);
+        }
     }
 
     @Override