From b47ddd4a1d3363ed6477e6cf4ffbc13cc8164c24 Mon Sep 17 00:00:00 2001 From: Ashley Rose Date: Mon, 28 Jan 2019 19:54:09 -0500 Subject: [PATCH] Run inspector annotation processor on framework Test: m Bug: 117616612 Change-Id: Ifb013cf576e57818493a52aefec9729ecca4ac08 --- Android.bp | 1 + core/java/android/view/View.java | 9 ++++----- .../processor/view/inspector/InspectablePropertyProcessor.java | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Android.bp b/Android.bp index 7ce8b31e42c2..1d7dafd5f3f3 100644 --- a/Android.bp +++ b/Android.bp @@ -778,6 +778,7 @@ java_defaults { "--multi-dex", ], + plugins: ["view-inspector-annotation-processor"], } filegroup { 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"), diff --git a/tools/processors/view_inspector/src/java/android/processor/view/inspector/InspectablePropertyProcessor.java b/tools/processors/view_inspector/src/java/android/processor/view/inspector/InspectablePropertyProcessor.java index 42ae890640cb..50c79da25eba 100644 --- a/tools/processors/view_inspector/src/java/android/processor/view/inspector/InspectablePropertyProcessor.java +++ b/tools/processors/view_inspector/src/java/android/processor/view/inspector/InspectablePropertyProcessor.java @@ -352,6 +352,8 @@ public final class InspectablePropertyProcessor implements ModelProcessor { } else { return Property.Type.OBJECT; } + case ARRAY: + return Property.Type.OBJECT; default: throw new ProcessingException( String.format("Unsupported return type %s.", returnType), -- 2.11.0