Skip to content
Snippets Groups Projects
Commit 50c590e8 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz Committed by Gerrit Code Review
Browse files

Revert "Move @ViewDebug.ExportedProperty annotations from private fields to public methods" 

This reverts commit 7f2a6227.

Reason for revert: Verifying if it is culprit for 299257121

Change-Id: I854221ccc99ecb43628b03f06d6365937c703c83
parent 7f2a6227
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
core/java/android/view/View.java
+ 76
− 76
View file @ 50c590e8
......@@ -2434,6 +2434,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @see #getId()
*/
@IdRes
@ViewDebug.ExportedProperty(resolveId = true)
int mID = NO_ID;
 
/** The ID of this view for autofill purposes.
......@@ -4240,6 +4241,71 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* This view's request for the visibility of the status bar.
* @hide
*/
@ViewDebug.ExportedProperty(flagMapping = {
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LOW_PROFILE,
equals = SYSTEM_UI_FLAG_LOW_PROFILE,
name = "LOW_PROFILE"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_HIDE_NAVIGATION,
equals = SYSTEM_UI_FLAG_HIDE_NAVIGATION,
name = "HIDE_NAVIGATION"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_FULLSCREEN,
equals = SYSTEM_UI_FLAG_FULLSCREEN,
name = "FULLSCREEN"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_STABLE,
equals = SYSTEM_UI_FLAG_LAYOUT_STABLE,
name = "LAYOUT_STABLE"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION,
equals = SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION,
name = "LAYOUT_HIDE_NAVIGATION"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
equals = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
name = "LAYOUT_FULLSCREEN"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_IMMERSIVE,
equals = SYSTEM_UI_FLAG_IMMERSIVE,
name = "IMMERSIVE"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_IMMERSIVE_STICKY,
equals = SYSTEM_UI_FLAG_IMMERSIVE_STICKY,
name = "IMMERSIVE_STICKY"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
equals = SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
name = "LIGHT_STATUS_BAR"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,
equals = SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,
name = "LIGHT_NAVIGATION_BAR"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_EXPAND,
equals = STATUS_BAR_DISABLE_EXPAND,
name = "STATUS_BAR_DISABLE_EXPAND"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_ICONS,
equals = STATUS_BAR_DISABLE_NOTIFICATION_ICONS,
name = "STATUS_BAR_DISABLE_NOTIFICATION_ICONS"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_ALERTS,
equals = STATUS_BAR_DISABLE_NOTIFICATION_ALERTS,
name = "STATUS_BAR_DISABLE_NOTIFICATION_ALERTS"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_TICKER,
equals = STATUS_BAR_DISABLE_NOTIFICATION_TICKER,
name = "STATUS_BAR_DISABLE_NOTIFICATION_TICKER"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SYSTEM_INFO,
equals = STATUS_BAR_DISABLE_SYSTEM_INFO,
name = "STATUS_BAR_DISABLE_SYSTEM_INFO"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_HOME,
equals = STATUS_BAR_DISABLE_HOME,
name = "STATUS_BAR_DISABLE_HOME"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_BACK,
equals = STATUS_BAR_DISABLE_BACK,
name = "STATUS_BAR_DISABLE_BACK"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_CLOCK,
equals = STATUS_BAR_DISABLE_CLOCK,
name = "STATUS_BAR_DISABLE_CLOCK"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_RECENT,
equals = STATUS_BAR_DISABLE_RECENT,
name = "STATUS_BAR_DISABLE_RECENT"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SEARCH,
equals = STATUS_BAR_DISABLE_SEARCH,
name = "STATUS_BAR_DISABLE_SEARCH"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_ONGOING_CALL_CHIP,
equals = STATUS_BAR_DISABLE_ONGOING_CALL_CHIP,
name = "STATUS_BAR_DISABLE_ONGOING_CALL_CHIP")
}, formatToHexString = true)
@SystemUiVisibility
int mSystemUiVisibility;
 
......@@ -4358,6 +4424,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* to the left edge of this view.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "layout")
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
protected int mLeft;
/**
......@@ -4365,6 +4432,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* to the right edge of this view.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "layout")
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
protected int mRight;
/**
......@@ -4372,6 +4440,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* to the top edge of this view.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "layout")
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
protected int mTop;
/**
......@@ -4379,6 +4448,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* to the bottom edge of this view.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "layout")
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
protected int mBottom;
 
......@@ -4389,6 +4459,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* accessing these directly.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "scrolling")
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
protected int mScrollX;
/**
......@@ -4398,6 +4469,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* accessing these directly.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "scrolling")
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
protected int mScrollY;
 
......@@ -4406,6 +4478,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* pixels between the left edge of this view and the left edge of its content.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "padding")
@UnsupportedAppUsage
protected int mPaddingLeft = 0;
/**
......@@ -4413,6 +4486,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* pixels between the right edge of this view and the right edge of its content.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "padding")
@UnsupportedAppUsage
protected int mPaddingRight = 0;
/**
......@@ -4420,6 +4494,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* pixels between the top edge of this view and the top edge of its content.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "padding")
@UnsupportedAppUsage
protected int mPaddingTop;
/**
......@@ -4427,6 +4502,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* pixels between the bottom edge of this view and the bottom edge of its content.
* {@hide}
*/
@ViewDebug.ExportedProperty(category = "padding")
@UnsupportedAppUsage
protected int mPaddingBottom;
 
......@@ -17121,7 +17197,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return The left edge of the displayed part of your view, in pixels.
*/
@InspectableProperty
@ViewDebug.ExportedProperty(category = "scrolling")
public final int getScrollX() {
return mScrollX;
}
......@@ -17134,7 +17209,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return The top edge of the displayed part of your view, in pixels.
*/
@InspectableProperty
@ViewDebug.ExportedProperty(category = "scrolling")
public final int getScrollY() {
return mScrollY;
}
......@@ -17925,7 +17999,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return The top of this view, in pixels.
*/
@ViewDebug.CapturedViewProperty
@ViewDebug.ExportedProperty(category = "layout")
public final int getTop() {
return mTop;
}
......@@ -17985,7 +18058,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return The bottom of this view, in pixels.
*/
@ViewDebug.CapturedViewProperty
@ViewDebug.ExportedProperty(category = "layout")
public final int getBottom() {
return mBottom;
}
......@@ -18051,7 +18123,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return The left edge of this view, in pixels.
*/
@ViewDebug.CapturedViewProperty
@ViewDebug.ExportedProperty(category = "layout")
public final int getLeft() {
return mLeft;
}
......@@ -18111,7 +18182,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return The right edge of this view, in pixels.
*/
@ViewDebug.CapturedViewProperty
@ViewDebug.ExportedProperty(category = "layout")
public final int getRight() {
return mRight;
}
......@@ -25320,7 +25390,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return the top padding in pixels
*/
@InspectableProperty
@ViewDebug.ExportedProperty(category = "padding")
public int getPaddingTop() {
return mPaddingTop;
}
......@@ -25333,7 +25402,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return the bottom padding in pixels
*/
@InspectableProperty
@ViewDebug.ExportedProperty(category = "padding")
public int getPaddingBottom() {
return mPaddingBottom;
}
......@@ -25346,7 +25414,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return the left padding in pixels
*/
@InspectableProperty
@ViewDebug.ExportedProperty(category = "padding")
public int getPaddingLeft() {
if (!isPaddingResolved()) {
resolvePadding();
......@@ -25377,7 +25444,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @return the right padding in pixels
*/
@InspectableProperty
@ViewDebug.ExportedProperty(category = "padding")
public int getPaddingRight() {
if (!isPaddingResolved()) {
resolvePadding();
......@@ -26063,7 +26129,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
@IdRes
@ViewDebug.CapturedViewProperty
@ViewDebug.ExportedProperty(resolveId = true)
@InspectableProperty
public int getId() {
return mID;
......@@ -27026,71 +27091,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @deprecated SystemUiVisibility flags are deprecated. Use {@link WindowInsetsController}
* instead.
*/
@ViewDebug.ExportedProperty(flagMapping = {
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LOW_PROFILE,
equals = SYSTEM_UI_FLAG_LOW_PROFILE,
name = "LOW_PROFILE"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_HIDE_NAVIGATION,
equals = SYSTEM_UI_FLAG_HIDE_NAVIGATION,
name = "HIDE_NAVIGATION"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_FULLSCREEN,
equals = SYSTEM_UI_FLAG_FULLSCREEN,
name = "FULLSCREEN"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_STABLE,
equals = SYSTEM_UI_FLAG_LAYOUT_STABLE,
name = "LAYOUT_STABLE"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION,
equals = SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION,
name = "LAYOUT_HIDE_NAVIGATION"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
equals = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
name = "LAYOUT_FULLSCREEN"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_IMMERSIVE,
equals = SYSTEM_UI_FLAG_IMMERSIVE,
name = "IMMERSIVE"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_IMMERSIVE_STICKY,
equals = SYSTEM_UI_FLAG_IMMERSIVE_STICKY,
name = "IMMERSIVE_STICKY"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
equals = SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
name = "LIGHT_STATUS_BAR"),
@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,
equals = SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,
name = "LIGHT_NAVIGATION_BAR"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_EXPAND,
equals = STATUS_BAR_DISABLE_EXPAND,
name = "STATUS_BAR_DISABLE_EXPAND"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_ICONS,
equals = STATUS_BAR_DISABLE_NOTIFICATION_ICONS,
name = "STATUS_BAR_DISABLE_NOTIFICATION_ICONS"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_ALERTS,
equals = STATUS_BAR_DISABLE_NOTIFICATION_ALERTS,
name = "STATUS_BAR_DISABLE_NOTIFICATION_ALERTS"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_TICKER,
equals = STATUS_BAR_DISABLE_NOTIFICATION_TICKER,
name = "STATUS_BAR_DISABLE_NOTIFICATION_TICKER"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SYSTEM_INFO,
equals = STATUS_BAR_DISABLE_SYSTEM_INFO,
name = "STATUS_BAR_DISABLE_SYSTEM_INFO"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_HOME,
equals = STATUS_BAR_DISABLE_HOME,
name = "STATUS_BAR_DISABLE_HOME"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_BACK,
equals = STATUS_BAR_DISABLE_BACK,
name = "STATUS_BAR_DISABLE_BACK"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_CLOCK,
equals = STATUS_BAR_DISABLE_CLOCK,
name = "STATUS_BAR_DISABLE_CLOCK"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_RECENT,
equals = STATUS_BAR_DISABLE_RECENT,
name = "STATUS_BAR_DISABLE_RECENT"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SEARCH,
equals = STATUS_BAR_DISABLE_SEARCH,
name = "STATUS_BAR_DISABLE_SEARCH"),
@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_ONGOING_CALL_CHIP,
equals = STATUS_BAR_DISABLE_ONGOING_CALL_CHIP,
name = "STATUS_BAR_DISABLE_ONGOING_CALL_CHIP")
}, formatToHexString = true)
@Deprecated
public int getSystemUiVisibility() {
return mSystemUiVisibility;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment