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

Commit 40e490e2 authored by Ember Rose's avatar Ember Rose Committed by Android (Google) Code Review
Browse files

Merge "Add @IdRes annotations to View properties"

parents e4e42224 dbb949a5

api/current.txt

+17 −17
Original line number Diff line number Diff line
@@ -50324,8 +50324,8 @@ package android.view { 
    method public int getAccessibilityLiveRegion();

    method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider();

    method @Nullable public CharSequence getAccessibilityPaneTitle();

    method public int getAccessibilityTraversalAfter();

    method public int getAccessibilityTraversalBefore();

    method @IdRes public int getAccessibilityTraversalAfter();

    method @IdRes public int getAccessibilityTraversalBefore();

    method @android.view.ViewDebug.ExportedProperty(category="drawing") public float getAlpha();

    method public android.view.animation.Animation getAnimation();

    method public android.os.IBinder getApplicationWindowToken();
@@ -50387,7 +50387,7 @@ package android.view { 
    method @android.view.ViewDebug.ExportedProperty(mapping={@android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, to="auto"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES, to="yes"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO, to="no"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS, to="yesExcludeDescendants"), @android.view.ViewDebug.IntToString(from=android.view.View.IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS, to="noExcludeDescendants")}) public int getImportantForContentCapture();

    method public boolean getKeepScreenOn();

    method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();

    method @android.view.ViewDebug.ExportedProperty(category="accessibility") public int getLabelFor();

    method @android.view.ViewDebug.ExportedProperty(category="accessibility") @IdRes public int getLabelFor();

    method public int getLayerType();

    method @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=android.view.View.LAYOUT_DIRECTION_LTR, to="RESOLVED_DIRECTION_LTR"), @android.view.ViewDebug.IntToString(from=android.view.View.LAYOUT_DIRECTION_RTL, to="RESOLVED_DIRECTION_RTL")}) public int getLayoutDirection();

    method @android.view.ViewDebug.ExportedProperty(deepExport=true, prefix="layout_") public android.view.ViewGroup.LayoutParams getLayoutParams();
@@ -50405,12 +50405,12 @@ package android.view { 
    method @android.view.ViewDebug.ExportedProperty(category="measurement", flagMapping={@android.view.ViewDebug.FlagToString(mask=android.view.View.MEASURED_STATE_MASK, equals=android.view.View.MEASURED_STATE_TOO_SMALL, name="MEASURED_STATE_TOO_SMALL")}) public final int getMeasuredWidthAndState();

    method public int getMinimumHeight();

    method public int getMinimumWidth();

    method public int getNextClusterForwardId();

    method public int getNextFocusDownId();

    method public int getNextFocusForwardId();

    method public int getNextFocusLeftId();

    method public int getNextFocusRightId();

    method public int getNextFocusUpId();

    method @IdRes public int getNextClusterForwardId();

    method @IdRes public int getNextFocusDownId();

    method @IdRes public int getNextFocusForwardId();

    method @IdRes public int getNextFocusLeftId();

    method @IdRes public int getNextFocusRightId();

    method @IdRes public int getNextFocusUpId();

    method public android.view.View.OnFocusChangeListener getOnFocusChangeListener();

    method @ColorInt public int getOutlineAmbientShadowColor();

    method public android.view.ViewOutlineProvider getOutlineProvider();
@@ -50672,8 +50672,8 @@ package android.view { 
    method public void setAccessibilityHeading(boolean);

    method public void setAccessibilityLiveRegion(int);

    method public void setAccessibilityPaneTitle(@Nullable CharSequence);

    method public void setAccessibilityTraversalAfter(int);

    method public void setAccessibilityTraversalBefore(int);

    method public void setAccessibilityTraversalAfter(@IdRes int);

    method public void setAccessibilityTraversalBefore(@IdRes int);

    method public void setActivated(boolean);

    method public void setAlpha(@FloatRange(from=0.0, to=1.0) float);

    method public void setAnimation(android.view.animation.Animation);
@@ -50738,12 +50738,12 @@ package android.view { 
    method public void setMinimumHeight(int);

    method public void setMinimumWidth(int);

    method public void setNestedScrollingEnabled(boolean);

    method public void setNextClusterForwardId(int);

    method public void setNextFocusDownId(int);

    method public void setNextFocusForwardId(int);

    method public void setNextFocusLeftId(int);

    method public void setNextFocusRightId(int);

    method public void setNextFocusUpId(int);

    method public void setNextClusterForwardId(@IdRes int);

    method public void setNextFocusDownId(@IdRes int);

    method public void setNextFocusForwardId(@IdRes int);

    method public void setNextFocusLeftId(@IdRes int);

    method public void setNextFocusRightId(@IdRes int);

    method public void setNextFocusUpId(@IdRes int);

    method public void setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener);

    method public void setOnCapturedPointerListener(android.view.View.OnCapturedPointerListener);

    method public void setOnClickListener(@Nullable android.view.View.OnClickListener);

core/java/android/view/View.java

+17 −8
Original line number Diff line number Diff line
@@ -10301,7 +10301,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @see #setImportantForAccessibility(int)

     */

    @RemotableViewMethod

    public void setAccessibilityTraversalBefore(int beforeId) {

    public void setAccessibilityTraversalBefore(@IdRes int beforeId) {

        if (mAccessibilityTraversalBeforeId == beforeId) {

            return;

        }
@@ -10318,6 +10318,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @see #setAccessibilityTraversalBefore(int)

     */

    @IdRes

    @InspectableProperty

    public int getAccessibilityTraversalBefore() {

        return mAccessibilityTraversalBeforeId;
@@ -10346,7 +10347,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @see #setImportantForAccessibility(int)

     */

    @RemotableViewMethod

    public void setAccessibilityTraversalAfter(int afterId) {

    public void setAccessibilityTraversalAfter(@IdRes int afterId) {

        if (mAccessibilityTraversalAfterId == afterId) {

            return;

        }
@@ -10363,6 +10364,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @see #setAccessibilityTraversalAfter(int)

     */

    @IdRes

    @InspectableProperty

    public int getAccessibilityTraversalAfter() {

        return mAccessibilityTraversalAfterId;
@@ -10374,6 +10376,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @return The labeled view id.

     */

    @IdRes

    @ViewDebug.ExportedProperty(category = "accessibility")

    @InspectableProperty

    public int getLabelFor() {
@@ -10595,6 +10598,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @attr ref android.R.styleable#View_nextFocusLeft

     */

    @IdRes

    @InspectableProperty(name = "nextFocusLeft")

    public int getNextFocusLeftId() {

        return mNextFocusLeftId;
@@ -10607,7 +10611,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @attr ref android.R.styleable#View_nextFocusLeft

     */

    public void setNextFocusLeftId(int nextFocusLeftId) {

    public void setNextFocusLeftId(@IdRes int nextFocusLeftId) {

        mNextFocusLeftId = nextFocusLeftId;

    }









@@ -10617,6 +10621,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusRight















     */













    @IdRes















    @InspectableProperty(name = "nextFocusRight")















    public int getNextFocusRightId() {















        return mNextFocusRightId;









@@ -10629,7 +10634,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusRight















     */













    public void setNextFocusRightId(int nextFocusRightId) {













    public void setNextFocusRightId(@IdRes int nextFocusRightId) {















        mNextFocusRightId = nextFocusRightId;















    }























@@ -10639,6 +10644,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusUp















     */













    @IdRes















    @InspectableProperty(name = "nextFocusUp")















    public int getNextFocusUpId() {















        return mNextFocusUpId;









@@ -10651,7 +10657,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusUp















     */













    public void setNextFocusUpId(int nextFocusUpId) {













    public void setNextFocusUpId(@IdRes int nextFocusUpId) {















        mNextFocusUpId = nextFocusUpId;















    }























@@ -10661,6 +10667,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusDown















     */













    @IdRes















    @InspectableProperty(name = "nextFocusDown")















    public int getNextFocusDownId() {















        return mNextFocusDownId;









@@ -10673,7 +10680,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusDown















     */













    public void setNextFocusDownId(int nextFocusDownId) {













    public void setNextFocusDownId(@IdRes int nextFocusDownId) {















        mNextFocusDownId = nextFocusDownId;















    }























@@ -10683,6 +10690,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusForward















     */













    @IdRes















    @InspectableProperty(name = "nextFocusForward")















    public int getNextFocusForwardId() {















        return mNextFocusForwardId;









@@ -10695,7 +10703,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextFocusForward















     */













    public void setNextFocusForwardId(int nextFocusForwardId) {













    public void setNextFocusForwardId(@IdRes int nextFocusForwardId) {















        mNextFocusForwardId = nextFocusForwardId;















    }























@@ -10706,6 +10714,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextClusterForward















     */













    @IdRes















    @InspectableProperty(name = "nextClusterForward")















    public int getNextClusterForwardId() {















        return mNextClusterForwardId;









@@ -10718,7 +10727,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     *















     * @attr ref android.R.styleable#View_nextClusterForward















     */













    public void setNextClusterForwardId(int nextClusterForwardId) {













    public void setNextClusterForwardId(@IdRes int nextClusterForwardId) {















        mNextClusterForwardId = nextClusterForwardId;















    }