summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAshley Rose <ashleyrose@google.com>2019-01-28 19:54:09 -0500
committerAshley Rose <ashleyrose@google.com>2019-01-29 13:34:31 -0500
commitb47ddd4a1d3363ed6477e6cf4ffbc13cc8164c24 (patch)
treeeae01a52e23563abcf8a7efe0a8f7154abd07491 /core/java/android
parenta319c6448b027f1169722295ceedac564a13de78 (diff)
Run inspector annotation processor on framework
Test: m Bug: 117616612 Change-Id: Ifb013cf576e57818493a52aefec9729ecca4ac08
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/View.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index cd3decf4e981..a17a188071ec 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -11396,7 +11396,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @see #setAssistBlocked(boolean)
* @attr ref android.R.styleable#View_assistBlocked
*/
- @InspectableProperty
public boolean isAssistBlocked() {
return (mPrivateFlags3 & PFLAG3_ASSIST_BLOCKED) != 0;
}
@@ -18272,7 +18271,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @attr ref android.R.styleable#View_scrollbarDefaultDelayBeforeFade
*/
- @InspectableProperty
+ @InspectableProperty(name = "scrollbarDefaultDelayBeforeFade")
public int getScrollBarDefaultDelayBeforeFade() {
return mScrollCache == null ? ViewConfiguration.getScrollDefaultDelay() :
mScrollCache.scrollBarDefaultDelayBeforeFade;
@@ -18297,7 +18296,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @attr ref android.R.styleable#View_scrollbarFadeDuration
*/
- @InspectableProperty
+ @InspectableProperty(name = "scrollbarFadeDuration")
public int getScrollBarFadeDuration() {
return mScrollCache == null ? ViewConfiguration.getScrollBarFadeDuration() :
mScrollCache.scrollBarFadeDuration;
@@ -18322,7 +18321,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @attr ref android.R.styleable#View_scrollbarSize
*/
- @InspectableProperty
+ @InspectableProperty(name = "scrollbarSize")
public int getScrollBarSize() {
return mScrollCache == null ? ViewConfiguration.get(mContext).getScaledScrollBarSize() :
mScrollCache.scrollBarSize;
@@ -18382,7 +18381,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
@ViewDebug.IntToString(from = SCROLLBARS_OUTSIDE_OVERLAY, to = "OUTSIDE_OVERLAY"),
@ViewDebug.IntToString(from = SCROLLBARS_OUTSIDE_INSET, to = "OUTSIDE_INSET")
})
- @InspectableProperty(enumMapping = {
+ @InspectableProperty(name = "scrollbarStyle", enumMapping = {
@EnumMap(value = SCROLLBARS_INSIDE_OVERLAY, name = "insideOverlay"),
@EnumMap(value = SCROLLBARS_INSIDE_INSET, name = "insideInset"),
@EnumMap(value = SCROLLBARS_OUTSIDE_OVERLAY, name = "outsideOverlay"),