merge from open-source master
This commit is contained in:
@@ -24,6 +24,7 @@ import android.graphics.Canvas;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.Gravity;
|
||||
import android.view.ViewDebug;
|
||||
import android.view.accessibility.AccessibilityEvent;
|
||||
|
||||
|
||||
@@ -73,7 +74,8 @@ public class CheckedTextView extends TextView implements Checkable {
|
||||
public void toggle() {
|
||||
setChecked(!mChecked);
|
||||
}
|
||||
|
||||
|
||||
@ViewDebug.ExportedProperty
|
||||
public boolean isChecked() {
|
||||
return mChecked;
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.Gravity;
|
||||
import android.view.ViewDebug;
|
||||
import android.view.accessibility.AccessibilityEvent;
|
||||
|
||||
/**
|
||||
@@ -98,6 +99,7 @@ public abstract class CompoundButton extends Button implements Checkable {
|
||||
return super.performClick();
|
||||
}
|
||||
|
||||
@ViewDebug.ExportedProperty
|
||||
public boolean isChecked() {
|
||||
return mChecked;
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ import android.graphics.drawable.shapes.Shape;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.Gravity;
|
||||
import android.view.View;
|
||||
import android.view.ViewDebug;
|
||||
import android.view.animation.AlphaAnimation;
|
||||
import android.view.animation.Animation;
|
||||
import android.view.animation.AnimationUtils;
|
||||
@@ -335,6 +336,7 @@ public class ProgressBar extends View {
|
||||
*
|
||||
* @return true if the progress bar is in indeterminate mode
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
public synchronized boolean isIndeterminate() {
|
||||
return mIndeterminate;
|
||||
}
|
||||
@@ -607,6 +609,7 @@ public class ProgressBar extends View {
|
||||
* @see #setMax(int)
|
||||
* @see #getMax()
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
public synchronized int getProgress() {
|
||||
return mIndeterminate ? 0 : mProgress;
|
||||
}
|
||||
@@ -623,6 +626,7 @@ public class ProgressBar extends View {
|
||||
* @see #setMax(int)
|
||||
* @see #getMax()
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
public synchronized int getSecondaryProgress() {
|
||||
return mIndeterminate ? 0 : mSecondaryProgress;
|
||||
}
|
||||
@@ -636,6 +640,7 @@ public class ProgressBar extends View {
|
||||
* @see #getProgress()
|
||||
* @see #getSecondaryProgress()
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
public synchronized int getMax() {
|
||||
return mMax;
|
||||
}
|
||||
|
||||
@@ -5731,6 +5731,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
|
||||
/**
|
||||
* Convenience for {@link Selection#getSelectionStart}.
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
public int getSelectionStart() {
|
||||
return Selection.getSelectionStart(getText());
|
||||
}
|
||||
@@ -5738,6 +5739,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
|
||||
/**
|
||||
* Convenience for {@link Selection#getSelectionEnd}.
|
||||
*/
|
||||
@ViewDebug.ExportedProperty
|
||||
public int getSelectionEnd() {
|
||||
return Selection.getSelectionEnd(getText());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user