PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: b0a4c897ac

Change-Id: Ic9f17f748d414e7c5307d4e81d79a1a55a444091
This commit is contained in:
Tony Mak
2016-07-06 09:07:02 +00:00
committed by android-build-merger
parent 7f4ded6b14 b0a4c897ac
commit b62a70db93
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/RestrictedListPreference.java
View File

@@ -46,6 +46,7 @@ public class RestrictedListPreference extends CustomListPreference {
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 class RestrictedListPreference extends CustomListPreference {
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