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

Merge "Clear check mark resource ID when set from Drawable object"

Browse Source
This commit is contained in:
Alan Viverette
2015-08-12 20:59:44 +00:00
committed by Android (Google) Code Review
parent 3111d4e17a c60feca6a9
commit 00cdbce6c3
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/widget/CheckedTextView.java
View File

@@ -152,13 +152,8 @@ public class CheckedTextView extends TextView implements Checkable {
return;
}
mCheckMarkResource = resId;
Drawable d = null;
if (mCheckMarkResource != 0) {
d = getContext().getDrawable(mCheckMarkResource);
}
setCheckMarkDrawable(d);
final Drawable d = resId != 0 ? getContext().getDrawable(resId) : null;
setCheckMarkDrawableInternal(d, resId);
}
/**
@@ -172,12 +167,18 @@ public class CheckedTextView extends TextView implements Checkable {
* @see #setCheckMarkDrawable(int)
* @see #getCheckMarkDrawable()
*/
public void setCheckMarkDrawable(Drawable d) {
public void setCheckMarkDrawable(@Nullable Drawable d) {
setCheckMarkDrawableInternal(d, 0);
}
private void setCheckMarkDrawableInternal(@Nullable Drawable d, @DrawableRes int resId) {
if (mCheckMarkDrawable != null) {
mCheckMarkDrawable.setCallback(null);
unscheduleDrawable(mCheckMarkDrawable);
}
mNeedRequestlayout = (d != mCheckMarkDrawable);
if (d != null) {
d.setCallback(this);
d.setVisible(getVisibility() == VISIBLE, false);
@@ -190,7 +191,9 @@ public class CheckedTextView extends TextView implements Checkable {
} else {
mCheckMarkWidth = 0;
}
mCheckMarkDrawable = d;
mCheckMarkResource = resId;
// Do padding resolution. This will call internalSetPadding() and do a
// requestLayout() if needed.