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

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

Merge "Rename @EnumEntry and @FlagEntry"

parents 7c9b6f45 73abdd3c

api/test-current.txt

+6 −6
Original line number Diff line number Diff line
@@ -3172,19 +3172,19 @@ package android.view.inspector { 


  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface InspectableProperty {

    method public abstract int attributeId() default android.content.res.Resources.ID_NULL;

    method public abstract android.view.inspector.InspectableProperty.EnumMap[] enumMapping() default {};

    method public abstract android.view.inspector.InspectableProperty.FlagMap[] flagMapping() default {};

    method public abstract android.view.inspector.InspectableProperty.EnumEntry[] enumMapping() default {};

    method public abstract android.view.inspector.InspectableProperty.FlagEntry[] flagMapping() default {};

    method public abstract boolean hasAttributeId() default true;

    method public abstract String name() default "";

    method public abstract android.view.inspector.InspectableProperty.ValueType valueType() default android.view.inspector.InspectableProperty.ValueType.INFERRED;

  }



  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface InspectableProperty.EnumMap {

  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface InspectableProperty.EnumEntry {

    method public abstract String name();

    method public abstract int value();

  }



  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface InspectableProperty.FlagMap {

  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public static @interface InspectableProperty.FlagEntry {

    method public abstract int mask() default 0;

    method public abstract String name();

    method public abstract int target();
@@ -3213,7 +3213,7 @@ package android.widget { 
  }



  public class DatePicker extends android.widget.FrameLayout {

    method @android.view.inspector.InspectableProperty(name="datePickerMode", enumMapping={@android.view.inspector.InspectableProperty.EnumMap(value=android.widget.DatePicker.MODE_SPINNER, name="spinner"), @android.view.inspector.InspectableProperty.EnumMap(value=android.widget.DatePicker.MODE_CALENDAR, name="calendar")}) public int getMode();

    method @android.view.inspector.InspectableProperty(name="datePickerMode", enumMapping={@android.view.inspector.InspectableProperty.EnumEntry(value=android.widget.DatePicker.MODE_SPINNER, name="spinner"), @android.view.inspector.InspectableProperty.EnumEntry(value=android.widget.DatePicker.MODE_CALENDAR, name="calendar")}) public int getMode();

    field public static final int MODE_CALENDAR = 2; // 0x2

    field public static final int MODE_SPINNER = 1; // 0x1

  }
@@ -3249,7 +3249,7 @@ package android.widget { 
    method public android.view.View getAmView();

    method public android.view.View getHourView();

    method public android.view.View getMinuteView();

    method @android.view.inspector.InspectableProperty(name="timePickerMode", enumMapping={@android.view.inspector.InspectableProperty.EnumMap(name="clock", value=android.widget.TimePicker.MODE_CLOCK), @android.view.inspector.InspectableProperty.EnumMap(name="spinner", value=android.widget.TimePicker.MODE_SPINNER)}) public int getMode();

    method @android.view.inspector.InspectableProperty(name="timePickerMode", enumMapping={@android.view.inspector.InspectableProperty.EnumEntry(name="clock", value=android.widget.TimePicker.MODE_CLOCK), @android.view.inspector.InspectableProperty.EnumEntry(name="spinner", value=android.widget.TimePicker.MODE_SPINNER)}) public int getMode();

    method public android.view.View getPmView();

    field public static final int MODE_CLOCK = 2; // 0x2

    field public static final int MODE_SPINNER = 1; // 0x1

core/java/android/view/View.java

+82 −82
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ import android.view.inputmethod.EditorInfo; 
import android.view.inputmethod.InputConnection;

import android.view.inputmethod.InputMethodManager;

import android.view.inspector.InspectableProperty;

import android.view.inspector.InspectableProperty.EnumMap;

import android.view.inspector.InspectableProperty.FlagMap;

import android.view.inspector.InspectableProperty.EnumEntry;

import android.view.inspector.InspectableProperty.FlagEntry;

import android.widget.Checkable;

import android.widget.FrameLayout;

import android.widget.ScrollBarDrawable;
@@ -6902,13 +6902,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @return a bitmask representing the enabled scroll indicators

     */

    @InspectableProperty(flagMapping = {

            @FlagMap(target = SCROLL_INDICATORS_NONE, mask = 0xffff_ffff, name = "none"),

            @FlagMap(target = SCROLL_INDICATOR_TOP, name = "top"),

            @FlagMap(target = SCROLL_INDICATOR_BOTTOM, name = "bottom"),

            @FlagMap(target = SCROLL_INDICATOR_LEFT, name = "left"),

            @FlagMap(target = SCROLL_INDICATOR_RIGHT, name = "right"),

            @FlagMap(target = SCROLL_INDICATOR_START, name = "start"),

            @FlagMap(target = SCROLL_INDICATOR_END, name = "end")

            @FlagEntry(target = SCROLL_INDICATORS_NONE, mask = 0xffff_ffff, name = "none"),

            @FlagEntry(target = SCROLL_INDICATOR_TOP, name = "top"),

            @FlagEntry(target = SCROLL_INDICATOR_BOTTOM, name = "bottom"),

            @FlagEntry(target = SCROLL_INDICATOR_LEFT, name = "left"),

            @FlagEntry(target = SCROLL_INDICATOR_RIGHT, name = "right"),

            @FlagEntry(target = SCROLL_INDICATOR_START, name = "start"),

            @FlagEntry(target = SCROLL_INDICATOR_END, name = "end")

    })

    @ScrollIndicators

    public int getScrollIndicators() {
@@ -9037,12 +9037,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS,

                to = "noExcludeDescendants")})

    @InspectableProperty(enumMapping = {

            @EnumMap(value = IMPORTANT_FOR_AUTOFILL_AUTO, name = "auto"),

            @EnumMap(value = IMPORTANT_FOR_AUTOFILL_YES, name = "yes"),

            @EnumMap(value = IMPORTANT_FOR_AUTOFILL_NO, name = "no"),

            @EnumMap(value = IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS,

            @EnumEntry(value = IMPORTANT_FOR_AUTOFILL_AUTO, name = "auto"),

            @EnumEntry(value = IMPORTANT_FOR_AUTOFILL_YES, name = "yes"),

            @EnumEntry(value = IMPORTANT_FOR_AUTOFILL_NO, name = "no"),

            @EnumEntry(value = IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS,

                    name = "yesExcludeDescendants"),

            @EnumMap(value = IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS,

            @EnumEntry(value = IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS,

                    name = "noExcludeDescendants"),

    })

    public @AutofillImportance int getImportantForAutofill() {
@@ -9230,12 +9230,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS,

                to = "noExcludeDescendants")})

    @InspectableProperty(enumMapping = {

            @EnumMap(value = IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, name = "auto"),

            @EnumMap(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES, name = "yes"),

            @EnumMap(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO, name = "no"),

            @EnumMap(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS,

            @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_AUTO, name = "auto"),

            @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES, name = "yes"),

            @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO, name = "no"),

            @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_YES_EXCLUDE_DESCENDANTS,

                    name = "yesExcludeDescendants"),

            @EnumMap(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS,

            @EnumEntry(value = IMPORTANT_FOR_CONTENT_CAPTURE_NO_EXCLUDE_DESCENDANTS,

                    name = "noExcludeDescendants"),

    })

    public @ContentCaptureImportance int getImportantForContentCapture() {
@@ -10539,9 +10539,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    @Deprecated

    @DrawingCacheQuality

    @InspectableProperty(enumMapping = {

            @EnumMap(value = DRAWING_CACHE_QUALITY_LOW, name = "low"),

            @EnumMap(value = DRAWING_CACHE_QUALITY_HIGH, name = "high"),

            @EnumMap(value = DRAWING_CACHE_QUALITY_AUTO, name = "auto")

            @EnumEntry(value = DRAWING_CACHE_QUALITY_LOW, name = "low"),

            @EnumEntry(value = DRAWING_CACHE_QUALITY_HIGH, name = "high"),

            @EnumEntry(value = DRAWING_CACHE_QUALITY_AUTO, name = "auto")

    })

    public int getDrawingCacheQuality() {

        return mViewFlags & DRAWING_CACHE_QUALITY_MASK;
@@ -11281,9 +11281,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        @ViewDebug.IntToString(from = GONE,      to = "GONE")

    })

    @InspectableProperty(enumMapping = {

            @EnumMap(value = VISIBLE, name = "visible"),

            @EnumMap(value = INVISIBLE, name = "invisible"),

            @EnumMap(value = GONE, name = "gone")

            @EnumEntry(value = VISIBLE, name = "visible"),

            @EnumEntry(value = INVISIBLE, name = "invisible"),

            @EnumEntry(value = GONE, name = "gone")

    })

    @Visibility

    public int getVisibility() {
@@ -11532,10 +11532,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        @ViewDebug.IntToString(from = LAYOUT_DIRECTION_LOCALE,  to = "LOCALE")

    })

    @InspectableProperty(hasAttributeId = false, enumMapping = {

            @EnumMap(value = LAYOUT_DIRECTION_LTR, name = "ltr"),

            @EnumMap(value = LAYOUT_DIRECTION_RTL, name = "rtl"),

            @EnumMap(value = LAYOUT_DIRECTION_INHERIT, name = "inherit"),

            @EnumMap(value = LAYOUT_DIRECTION_LOCALE, name = "locale")

            @EnumEntry(value = LAYOUT_DIRECTION_LTR, name = "ltr"),

            @EnumEntry(value = LAYOUT_DIRECTION_RTL, name = "rtl"),

            @EnumEntry(value = LAYOUT_DIRECTION_INHERIT, name = "inherit"),

            @EnumEntry(value = LAYOUT_DIRECTION_LOCALE, name = "locale")

    })

    @LayoutDir

    public int getRawLayoutDirection() {
@@ -11591,8 +11591,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        @ViewDebug.IntToString(from = LAYOUT_DIRECTION_RTL, to = "RESOLVED_DIRECTION_RTL")

    })

    @InspectableProperty(enumMapping = {

            @EnumMap(value = LAYOUT_DIRECTION_LTR, name = "ltr"),

            @EnumMap(value = LAYOUT_DIRECTION_RTL, name = "rtl")

            @EnumEntry(value = LAYOUT_DIRECTION_LTR, name = "ltr"),

            @EnumEntry(value = LAYOUT_DIRECTION_RTL, name = "rtl")

    })

    @ResolvedLayoutDir

    public int getLayoutDirection() {
@@ -12077,9 +12077,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = FOCUSABLE_AUTO, to = "FOCUSABLE_AUTO")

            }, category = "focus")

    @InspectableProperty(enumMapping = {

            @EnumMap(value = NOT_FOCUSABLE, name = "false"),

            @EnumMap(value = FOCUSABLE, name = "true"),

            @EnumMap(value = FOCUSABLE_AUTO, name = "auto")

            @EnumEntry(value = NOT_FOCUSABLE, name = "false"),

            @EnumEntry(value = FOCUSABLE, name = "true"),

            @EnumEntry(value = FOCUSABLE_AUTO, name = "auto")

    })

    @Focusable

    public int getFocusable() {
@@ -12962,10 +12962,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
                    to = "noHideDescendants")

        })

    @InspectableProperty(enumMapping = {

            @EnumMap(value = IMPORTANT_FOR_ACCESSIBILITY_AUTO, name = "auto"),

            @EnumMap(value = IMPORTANT_FOR_ACCESSIBILITY_YES, name = "yes"),

            @EnumMap(value = IMPORTANT_FOR_ACCESSIBILITY_NO, name = "no"),

            @EnumMap(value = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS,

            @EnumEntry(value = IMPORTANT_FOR_ACCESSIBILITY_AUTO, name = "auto"),

            @EnumEntry(value = IMPORTANT_FOR_ACCESSIBILITY_YES, name = "yes"),

            @EnumEntry(value = IMPORTANT_FOR_ACCESSIBILITY_NO, name = "no"),

            @EnumEntry(value = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS,

                    name = "noHideDescendants"),

    })

    public int getImportantForAccessibility() {
@@ -13021,9 +13021,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @see #setAccessibilityLiveRegion(int)

     */

    @InspectableProperty(enumMapping = {

            @EnumMap(value = ACCESSIBILITY_LIVE_REGION_NONE, name = "none"),

            @EnumMap(value = ACCESSIBILITY_LIVE_REGION_POLITE, name = "polite"),

            @EnumMap(value = ACCESSIBILITY_LIVE_REGION_ASSERTIVE, name = "assertive")

            @EnumEntry(value = ACCESSIBILITY_LIVE_REGION_NONE, name = "none"),

            @EnumEntry(value = ACCESSIBILITY_LIVE_REGION_POLITE, name = "polite"),

            @EnumEntry(value = ACCESSIBILITY_LIVE_REGION_ASSERTIVE, name = "assertive")

    })

    public int getAccessibilityLiveRegion() {

        return (mPrivateFlags2 & PFLAG2_ACCESSIBILITY_LIVE_REGION_MASK)
@@ -18651,9 +18651,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @hide

     */

    @InspectableProperty(name = "requiresFadingEdge", flagMapping = {

            @FlagMap(target = FADING_EDGE_NONE, mask = FADING_EDGE_MASK, name = "none"),

            @FlagMap(target = FADING_EDGE_VERTICAL, name = "vertical"),

            @FlagMap(target = FADING_EDGE_HORIZONTAL, name = "horizontal")

            @FlagEntry(target = FADING_EDGE_NONE, mask = FADING_EDGE_MASK, name = "none"),

            @FlagEntry(target = FADING_EDGE_VERTICAL, name = "vertical"),

            @FlagEntry(target = FADING_EDGE_HORIZONTAL, name = "horizontal")

    })

    public int getFadingEdge() {

        return mViewFlags & FADING_EDGE_MASK;
@@ -18948,10 +18948,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = SCROLLBARS_OUTSIDE_INSET, to = "OUTSIDE_INSET")

    })

    @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"),

            @EnumMap(value = SCROLLBARS_OUTSIDE_INSET, name = "outsideInset")

            @EnumEntry(value = SCROLLBARS_INSIDE_OVERLAY, name = "insideOverlay"),

            @EnumEntry(value = SCROLLBARS_INSIDE_INSET, name = "insideInset"),

            @EnumEntry(value = SCROLLBARS_OUTSIDE_OVERLAY, name = "outsideOverlay"),

            @EnumEntry(value = SCROLLBARS_OUTSIDE_INSET, name = "outsideInset")

    })

    @ScrollBarStyle

    public int getScrollBarStyle() {
@@ -20504,9 +20504,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @see #LAYER_TYPE_HARDWARE

     */

    @InspectableProperty(enumMapping = {

            @EnumMap(value = LAYER_TYPE_NONE, name = "none"),

            @EnumMap(value = LAYER_TYPE_SOFTWARE, name = "software"),

            @EnumMap(value = LAYER_TYPE_HARDWARE, name = "hardware")

            @EnumEntry(value = LAYER_TYPE_NONE, name = "none"),

            @EnumEntry(value = LAYER_TYPE_SOFTWARE, name = "software"),

            @EnumEntry(value = LAYER_TYPE_HARDWARE, name = "hardware")

    })

    @LayerType

    public int getLayerType() {
@@ -26187,9 +26187,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * @return This view's over-scroll mode.

     */

    @InspectableProperty(enumMapping = {

            @EnumMap(value = OVER_SCROLL_ALWAYS, name = "always"),

            @EnumMap(value = OVER_SCROLL_IF_CONTENT_SCROLLS, name = "ifContentScrolls"),

            @EnumMap(value = OVER_SCROLL_NEVER, name = "never")

            @EnumEntry(value = OVER_SCROLL_ALWAYS, name = "always"),

            @EnumEntry(value = OVER_SCROLL_IF_CONTENT_SCROLLS, name = "ifContentScrolls"),

            @EnumEntry(value = OVER_SCROLL_NEVER, name = "never")

    })

    public int getOverScrollMode() {

        return mOverScrollMode;
@@ -26580,14 +26580,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = TEXT_DIRECTION_FIRST_STRONG_RTL, to = "FIRST_STRONG_RTL")

    })

    @InspectableProperty(hasAttributeId = false, enumMapping = {

            @EnumMap(value = TEXT_DIRECTION_INHERIT, name = "inherit"),

            @EnumMap(value = TEXT_DIRECTION_LOCALE, name = "locale"),

            @EnumMap(value = TEXT_DIRECTION_ANY_RTL, name = "anyRtl"),

            @EnumMap(value = TEXT_DIRECTION_LTR, name = "ltr"),

            @EnumMap(value = TEXT_DIRECTION_RTL, name = "rtl"),

            @EnumMap(value = TEXT_DIRECTION_FIRST_STRONG, name = "firstStrong"),

            @EnumMap(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"),

            @EnumMap(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"),

            @EnumEntry(value = TEXT_DIRECTION_INHERIT, name = "inherit"),

            @EnumEntry(value = TEXT_DIRECTION_LOCALE, name = "locale"),

            @EnumEntry(value = TEXT_DIRECTION_ANY_RTL, name = "anyRtl"),

            @EnumEntry(value = TEXT_DIRECTION_LTR, name = "ltr"),

            @EnumEntry(value = TEXT_DIRECTION_RTL, name = "rtl"),

            @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG, name = "firstStrong"),

            @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"),

            @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"),

    })

    @UnsupportedAppUsage

    public int getRawTextDirection() {
@@ -26657,13 +26657,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = TEXT_DIRECTION_FIRST_STRONG_RTL, to = "FIRST_STRONG_RTL")

    })

    @InspectableProperty(hasAttributeId = false, enumMapping = {

            @EnumMap(value = TEXT_DIRECTION_LOCALE, name = "locale"),

            @EnumMap(value = TEXT_DIRECTION_ANY_RTL, name = "anyRtl"),

            @EnumMap(value = TEXT_DIRECTION_LTR, name = "ltr"),

            @EnumMap(value = TEXT_DIRECTION_RTL, name = "rtl"),

            @EnumMap(value = TEXT_DIRECTION_FIRST_STRONG, name = "firstStrong"),

            @EnumMap(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"),

            @EnumMap(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"),

            @EnumEntry(value = TEXT_DIRECTION_LOCALE, name = "locale"),

            @EnumEntry(value = TEXT_DIRECTION_ANY_RTL, name = "anyRtl"),

            @EnumEntry(value = TEXT_DIRECTION_LTR, name = "ltr"),

            @EnumEntry(value = TEXT_DIRECTION_RTL, name = "rtl"),

            @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG, name = "firstStrong"),

            @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_LTR, name = "firstStrongLtr"),

            @EnumEntry(value = TEXT_DIRECTION_FIRST_STRONG_RTL, name = "firstStrongRtl"),

    })

    public int getTextDirection() {

        return (mPrivateFlags2 & PFLAG2_TEXT_DIRECTION_RESOLVED_MASK) >> PFLAG2_TEXT_DIRECTION_RESOLVED_MASK_SHIFT;
@@ -26837,13 +26837,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = TEXT_ALIGNMENT_VIEW_END, to = "VIEW_END")

    })

    @InspectableProperty(hasAttributeId = false, enumMapping = {

            @EnumMap(value = TEXT_ALIGNMENT_INHERIT, name = "inherit"),

            @EnumMap(value = TEXT_ALIGNMENT_GRAVITY, name = "gravity"),

            @EnumMap(value = TEXT_ALIGNMENT_TEXT_START, name = "textStart"),

            @EnumMap(value = TEXT_ALIGNMENT_TEXT_END, name = "textEnd"),

            @EnumMap(value = TEXT_ALIGNMENT_CENTER, name = "center"),

            @EnumMap(value = TEXT_ALIGNMENT_VIEW_START, name = "viewStart"),

            @EnumMap(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd")

            @EnumEntry(value = TEXT_ALIGNMENT_INHERIT, name = "inherit"),

            @EnumEntry(value = TEXT_ALIGNMENT_GRAVITY, name = "gravity"),

            @EnumEntry(value = TEXT_ALIGNMENT_TEXT_START, name = "textStart"),

            @EnumEntry(value = TEXT_ALIGNMENT_TEXT_END, name = "textEnd"),

            @EnumEntry(value = TEXT_ALIGNMENT_CENTER, name = "center"),

            @EnumEntry(value = TEXT_ALIGNMENT_VIEW_START, name = "viewStart"),

            @EnumEntry(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd")

    })

    @TextAlignment

    @UnsupportedAppUsage
@@ -26912,12 +26912,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            @ViewDebug.IntToString(from = TEXT_ALIGNMENT_VIEW_END, to = "VIEW_END")

    })

    @InspectableProperty(enumMapping = {

            @EnumMap(value = TEXT_ALIGNMENT_GRAVITY, name = "gravity"),

            @EnumMap(value = TEXT_ALIGNMENT_TEXT_START, name = "textStart"),

            @EnumMap(value = TEXT_ALIGNMENT_TEXT_END, name = "textEnd"),

            @EnumMap(value = TEXT_ALIGNMENT_CENTER, name = "center"),

            @EnumMap(value = TEXT_ALIGNMENT_VIEW_START, name = "viewStart"),

            @EnumMap(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd")

            @EnumEntry(value = TEXT_ALIGNMENT_GRAVITY, name = "gravity"),

            @EnumEntry(value = TEXT_ALIGNMENT_TEXT_START, name = "textStart"),

            @EnumEntry(value = TEXT_ALIGNMENT_TEXT_END, name = "textEnd"),

            @EnumEntry(value = TEXT_ALIGNMENT_CENTER, name = "center"),

            @EnumEntry(value = TEXT_ALIGNMENT_VIEW_START, name = "viewStart"),

            @EnumEntry(value = TEXT_ALIGNMENT_VIEW_END, name = "viewEnd")

    })

    @TextAlignment

    public int getTextAlignment() {

core/java/android/view/ViewGroup.java

+14 −14
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ import android.view.animation.LayoutAnimationController; 
import android.view.animation.Transformation;

import android.view.autofill.Helper;

import android.view.inspector.InspectableProperty;

import android.view.inspector.InspectableProperty.EnumMap;

import android.view.inspector.InspectableProperty.EnumEntry;



import com.android.internal.R;
@@ -778,9 +778,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        @ViewDebug.IntToString(from = FOCUS_BLOCK_DESCENDANTS, to = "FOCUS_BLOCK_DESCENDANTS")

    })

    @InspectableProperty(enumMapping = {

            @EnumMap(value = FOCUS_BEFORE_DESCENDANTS, name = "beforeDescendants"),

            @EnumMap(value = FOCUS_AFTER_DESCENDANTS, name = "afterDescendants"),

            @EnumMap(value = FOCUS_BLOCK_DESCENDANTS, name = "blocksDescendants")

            @EnumEntry(value = FOCUS_BEFORE_DESCENDANTS, name = "beforeDescendants"),

            @EnumEntry(value = FOCUS_AFTER_DESCENDANTS, name = "afterDescendants"),

            @EnumEntry(value = FOCUS_BLOCK_DESCENDANTS, name = "blocksDescendants")

    })

    public int getDescendantFocusability() {

        return mGroupFlags & FLAG_MASK_FOCUSABILITY;
@@ -6574,10 +6574,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        @ViewDebug.IntToString(from = PERSISTENT_ALL_CACHES,      to = "ALL")

    })

    @InspectableProperty(enumMapping = {

            @EnumMap(value = PERSISTENT_NO_CACHE, name = "none"),

            @EnumMap(value = PERSISTENT_ANIMATION_CACHE, name = "animation"),

            @EnumMap(value = PERSISTENT_SCROLLING_CACHE, name = "scrolling"),

            @EnumMap(value = PERSISTENT_ALL_CACHES, name = "all"),

            @EnumEntry(value = PERSISTENT_NO_CACHE, name = "none"),

            @EnumEntry(value = PERSISTENT_ANIMATION_CACHE, name = "animation"),

            @EnumEntry(value = PERSISTENT_SCROLLING_CACHE, name = "scrolling"),

            @EnumEntry(value = PERSISTENT_ALL_CACHES, name = "all"),

    })

    public int getPersistentDrawingCache() {

        return mPersistentDrawingCache;
@@ -6657,8 +6657,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
     * @see #setLayoutMode(int)

     */

    @InspectableProperty(enumMapping = {

            @EnumMap(value = LAYOUT_MODE_CLIP_BOUNDS, name = "clipBounds"),

            @EnumMap(value = LAYOUT_MODE_OPTICAL_BOUNDS, name = "opticalBounds")

            @EnumEntry(value = LAYOUT_MODE_CLIP_BOUNDS, name = "clipBounds"),

            @EnumEntry(value = LAYOUT_MODE_OPTICAL_BOUNDS, name = "opticalBounds")

    })

    public int getLayoutMode() {

        if (mLayoutMode == LAYOUT_MODE_UNDEFINED) {
@@ -7849,8 +7849,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT")

        })

        @InspectableProperty(name = "layout_width", enumMapping = {

                @InspectableProperty.EnumMap(name = "match_parent", value = MATCH_PARENT),

                @InspectableProperty.EnumMap(name = "wrap_content", value = WRAP_CONTENT)

                @EnumEntry(name = "match_parent", value = MATCH_PARENT),

                @EnumEntry(name = "wrap_content", value = WRAP_CONTENT)

        })

        public int width;
@@ -7864,8 +7864,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            @ViewDebug.IntToString(from = WRAP_CONTENT, to = "WRAP_CONTENT")

        })

        @InspectableProperty(name = "layout_height", enumMapping = {

                @InspectableProperty.EnumMap(name = "match_parent", value = MATCH_PARENT),

                @InspectableProperty.EnumMap(name = "wrap_content", value = WRAP_CONTENT)

                @EnumEntry(name = "match_parent", value = MATCH_PARENT),

                @EnumEntry(name = "wrap_content", value = WRAP_CONTENT)

        })

        public int height;

core/java/android/view/inspector/InspectableProperty.java

+9 −9

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/webkit/WebView.java

+3 −3
Original line number Diff line number Diff line
@@ -2292,9 +2292,9 @@ public class WebView extends AbsoluteLayout 
     * @return the requested renderer priority policy.

     */

    @InspectableProperty(hasAttributeId = false, enumMapping = {

            @InspectableProperty.EnumMap(name = "waived", value = RENDERER_PRIORITY_WAIVED),

            @InspectableProperty.EnumMap(name = "bound", value = RENDERER_PRIORITY_BOUND),

            @InspectableProperty.EnumMap(name = "important", value = RENDERER_PRIORITY_IMPORTANT)

            @InspectableProperty.EnumEntry(name = "waived", value = RENDERER_PRIORITY_WAIVED),

            @InspectableProperty.EnumEntry(name = "bound", value = RENDERER_PRIORITY_BOUND),

            @InspectableProperty.EnumEntry(name = "important", value = RENDERER_PRIORITY_IMPORTANT)

    })

    @RendererPriority

    public int getRendererRequestedPriority() {