Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use compound drawable instead of image span." into nyc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2016-03-10 15:58:23 +00:00
committed by Android (Google) Code Review
parent 2f79ae98af f271fd5199
commit 91f80006e5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java
View File

@@ -651,8 +651,11 @@ public class RestrictedLockUtils {
final int disabledColor = context.getColor(R.color.disabled_text_color);
sb.setSpan(new ForegroundColorSpan(disabledColor), 0, sb.length(),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
final ImageSpan image = new RestrictedLockImageSpan(context);
sb.append(" ", image, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
textView.setCompoundDrawables(null, null, getRestrictedPadlock(context), null);
textView.setCompoundDrawablePadding(context.getResources().getDimensionPixelSize(
R.dimen.restricted_icon_padding));
} else {
textView.setCompoundDrawables(null, null, null, null);
}
textView.setText(sb);
}