commit 1e25ba3ed1196d51c502c8e0d53dc0d6f23ed974
author Tony Mak <tonymak@google.com> Tue Jun 28 16:30:38 2016 +0100
committer Tony Mak <tonymak@google.com> Mon Jul 04 04:01:49 2016 +0000
tree 52a52b1f32fb2074bfc3aa2d101b84bfe45a3fa5
parent f230f4f9ad469906db43b9351bc6d9f76cf0ef82

Show info icon when RestrictedListPreference is disabled

Fix: 29766349

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