Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563d3a62 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master

parents 8978547f 9a352305

core/java/android/widget/CheckedTextView.java

+3 −1
Original line number Diff line number Diff line
@@ -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;
@@ -74,6 +75,7 @@ public class CheckedTextView extends TextView implements Checkable { 
        setChecked(!mChecked);

    }



    @ViewDebug.ExportedProperty

    public boolean isChecked() {

        return mChecked;

    }

core/java/android/widget/CompoundButton.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }

core/java/android/widget/ProgressBar.java

+5 −0
Original line number Diff line number Diff line
@@ -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;

    }

core/java/android/widget/TextView.java

+2 −0
Original line number Diff line number Diff line
@@ -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());

    }