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

Merge "API fix in CheckedTextView" into jb-dev

Browse Source
This commit is contained in:
Gilles Debunne
2012-05-01 16:19:40 -07:00
committed by Android (Google) Code Review
parent ad759f958a 2fb40285c7
commit 61552bc81f
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -26902,6 +26902,7 @@ package android.widget {
ctor public CheckedTextView(android.content.Context);
ctor public CheckedTextView(android.content.Context, android.util.AttributeSet);
ctor public CheckedTextView(android.content.Context, android.util.AttributeSet, int);
method public android.graphics.drawable.Drawable getCheckMarkDrawable();
method public boolean isChecked();
method public void setCheckMarkDrawable(int);
method public void setCheckMarkDrawable(android.graphics.drawable.Drawable);

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

@@ -35,6 +35,8 @@ import android.view.accessibility.AccessibilityNodeInfo;
* {@link android.widget.ListView#setChoiceMode(int) setChoiceMode} has been set to
* something other than {@link android.widget.ListView#CHOICE_MODE_NONE CHOICE_MODE_NONE}.
*
* @attr ref android.R.styleable#CheckedTextView_checked
* @attr ref android.R.styleable#CheckedTextView_checkMark
*/
public class CheckedTextView extends TextView implements Checkable {
private boolean mChecked;
@@ -100,6 +102,11 @@ public class CheckedTextView extends TextView implements Checkable {
* when {@link #isChecked()} is true.
*
* @param resid The Drawable to use for the checkmark.
*
* @see #setCheckMarkDrawable(Drawable)
* @see #getCheckMarkDrawable()
*
* @attr ref android.R.styleable#CheckedTextView_checkMark
*/
public void setCheckMarkDrawable(int resid) {
if (resid != 0 && resid == mCheckMarkResource) {
@@ -119,6 +126,11 @@ public class CheckedTextView extends TextView implements Checkable {
* Set the checkmark to a given Drawable. This will be drawn when {@link #isChecked()} is true.
*
* @param d The Drawable to use for the checkmark.
*
* @see #setCheckMarkDrawable(int)
* @see #getCheckMarkDrawable()
*
* @attr ref android.R.styleable#CheckedTextView_checkMark
*/
public void setCheckMarkDrawable(Drawable d) {
if (mCheckMarkDrawable != null) {
@@ -142,6 +154,20 @@ public class CheckedTextView extends TextView implements Checkable {
resolvePadding();
}
/**
* Gets the checkmark drawable
*
* @return The drawable use to represent the checkmark, if any.
*
* @see #setCheckMarkDrawable(Drawable)
* @see #setCheckMarkDrawable(int)
*
* @attr ref android.R.styleable#CheckedTextView_checkMark
*/
public Drawable getCheckMarkDrawable() {
return mCheckMarkDrawable;
}
@Override
public void onPaddingChanged(int layoutDirection) {
int newPadding = (mCheckMarkDrawable != null) ?