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

Commit dbb949a5 authored by Ember Rose's avatar Ember Rose
Browse files

Add @IdRes annotations to View properties 

Change-Id: I6ef9f83b7cde3ee6f84951016b809a99c5ae281a
Fix: 127348933
Test: m framework
parent 715b34be

api/current.txt

+17 −17
Original line number Diff line number Diff line
@@ -50388,8 +50388,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();
@@ -50451,7 +50451,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();
@@ -50469,12 +50469,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();
@@ -50736,8 +50736,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);
@@ -50802,12 +50802,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
@@ -10297,7 +10297,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;

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

     * @see #setAccessibilityTraversalBefore(int)

     */

    @IdRes

    @InspectableProperty

    public int getAccessibilityTraversalBefore() {

        return mAccessibilityTraversalBeforeId;
@@ -10342,7 +10343,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;

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

     * @see #setAccessibilityTraversalAfter(int)

     */

    @IdRes

    @InspectableProperty

    public int getAccessibilityTraversalAfter() {

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

     * @return The labeled view id.

     */

    @IdRes

    @ViewDebug.ExportedProperty(category = "accessibility")

    @InspectableProperty

    public int getLabelFor() {
@@ -10591,6 +10594,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;
@@ -10603,7 +10607,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;

    }









@@ -10613,6 +10617,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;









@@ -10625,7 +10630,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;















    }























@@ -10635,6 +10640,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;









@@ -10647,7 +10653,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;















    }























@@ -10657,6 +10663,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;









@@ -10669,7 +10676,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;















    }























@@ -10679,6 +10686,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;









@@ -10691,7 +10699,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;















    }























@@ -10702,6 +10710,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;









@@ -10714,7 +10723,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;















    }