From ce8db9911494225fcd99711d7df85a130de5a6ce Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 13 Dec 2017 20:05:05 -0700 Subject: [PATCH] Add more IntDef prefixes for auto-documenting. Test: builds, boots Bug: 70177949 Exempt-From-Owner-Approval: annotation-only changes Change-Id: I76dde6054e06f52240bd4b1a0f196dcb74623608 --- .../AccessibilityService.java | 8 +- .../java/android/accounts/AccountManager.java | 9 +- core/java/android/app/ActionBar.java | 23 +++-- core/java/android/app/ActivityManager.java | 2 +- .../java/android/app/FragmentTransaction.java | 7 +- core/java/android/app/Notification.java | 8 +- core/java/android/app/StatusBarManager.java | 11 ++- core/java/android/app/UiModeManager.java | 6 +- core/java/android/app/WallpaperManager.java | 2 +- .../java/android/app/WindowConfiguration.java | 17 ++-- .../app/admin/DeviceAdminReceiver.java | 6 +- .../app/admin/DevicePolicyManager.java | 46 +++++---- .../android/app/admin/PasswordMetrics.java | 7 +- core/java/android/app/admin/SecurityLog.java | 22 +++-- .../android/app/admin/SystemUpdateInfo.java | 6 +- .../android/app/admin/SystemUpdatePolicy.java | 9 +- .../ActivityLifecycleItem.java | 13 ++- core/java/android/app/timezone/Callback.java | 11 ++- .../android/app/timezone/RulesManager.java | 6 +- .../java/android/app/timezone/RulesState.java | 10 +- core/java/android/app/usage/NetworkStats.java | 18 +++- core/java/android/app/usage/UsageEvents.java | 7 +- .../android/app/usage/UsageStatsManager.java | 2 +- .../android/bluetooth/BluetoothAdapter.java | 8 +- core/java/android/companion/DeviceFilter.java | 6 +- .../java/android/content/ContentResolver.java | 11 +-- core/java/android/content/Context.java | 28 +++--- core/java/android/content/Intent.java | 28 +++--- .../java/android/content/pm/ActivityInfo.java | 47 +++++---- .../java/android/content/pm/LauncherApps.java | 20 ++-- .../android/content/pm/SharedLibraryInfo.java | 12 +-- .../java/android/content/pm/ShortcutInfo.java | 24 +++-- .../android/content/res/Configuration.java | 37 ++++---- .../android/content/res/GradientColor.java | 7 +- .../java/android/hardware/HardwareBuffer.java | 10 +- .../hardware/SensorAdditionalInfo.java | 11 ++- .../android/hardware/SensorDirectChannel.java | 17 +++- .../camera2/CameraAccessException.java | 20 ++-- .../android/hardware/input/InputManager.java | 6 +- .../location/ContextHubTransaction.java | 13 ++- .../android/os/HardwarePropertiesManager.java | 16 ++-- core/java/android/os/MessageQueue.java | 6 +- core/java/android/os/PowerManager.java | 2 +- core/java/android/os/UserManager.java | 8 +- .../android/os/storage/StorageManager.java | 2 +- core/java/android/print/PrintAttributes.java | 11 ++- .../java/android/print/PrintDocumentInfo.java | 7 +- core/java/android/print/PrintJobInfo.java | 11 ++- core/java/android/print/PrinterInfo.java | 7 +- core/java/android/provider/FontsContract.java | 16 +++- core/java/android/provider/Settings.java | 2 +- .../service/autofill/FillEventHistory.java | 13 +-- .../android/service/autofill/FillRequest.java | 6 +- .../service/autofill/FillResponse.java | 2 +- .../android/service/autofill/SaveInfo.java | 32 +++---- .../service/notification/Condition.java | 7 +- .../NotificationListenerService.java | 7 +- .../PersistentDataBlockManager.java | 8 +- .../settings/suggestions/Suggestion.java | 2 +- .../service/trust/TrustAgentService.java | 18 ++-- .../voice/AlwaysOnHotwordDetector.java | 30 +++--- .../java/android/speech/tts/TextToSpeech.java | 11 ++- core/java/android/text/FontConfig.java | 6 +- core/java/android/text/Layout.java | 28 ++++-- core/java/android/transition/Visibility.java | 5 +- core/java/android/view/Display.java | 8 +- core/java/android/view/Surface.java | 15 ++- core/java/android/view/ThreadedRenderer.java | 6 +- core/java/android/view/View.java | 95 ++++++++++--------- core/java/android/view/WindowManager.java | 2 +- .../AccessibilityRequestPreparer.java | 7 +- .../view/autofill/AutofillManager.java | 6 +- core/java/android/webkit/WebSettings.java | 21 ++-- core/java/android/webkit/WebView.java | 8 +- core/java/android/webkit/WebViewClient.java | 10 +- core/java/android/widget/DatePicker.java | 5 +- core/java/android/widget/Editor.java | 11 ++- core/java/android/widget/GridLayout.java | 10 +- core/java/android/widget/GridView.java | 7 +- core/java/android/widget/LinearLayout.java | 13 ++- core/java/android/widget/NumberPicker.java | 6 +- core/java/android/widget/TextView.java | 5 +- core/java/android/widget/TimePicker.java | 5 +- core/java/android/widget/Toast.java | 5 +- 84 files changed, 660 insertions(+), 409 deletions(-) diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 8824643db447f..97dcb90bbb99c 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -391,8 +391,12 @@ public abstract class AccessibilityService extends Service { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SHOW_MODE_AUTO, SHOW_MODE_HIDDEN}) - public @interface SoftKeyboardShowMode {}; + @IntDef(prefix = { "SHOW_MODE_" }, value = { + SHOW_MODE_AUTO, + SHOW_MODE_HIDDEN + }) + public @interface SoftKeyboardShowMode {} + public static final int SHOW_MODE_AUTO = 0; public static final int SHOW_MODE_HIDDEN = 1; diff --git a/core/java/android/accounts/AccountManager.java b/core/java/android/accounts/AccountManager.java index bd9c9fa305364..782733f552a6f 100644 --- a/core/java/android/accounts/AccountManager.java +++ b/core/java/android/accounts/AccountManager.java @@ -290,8 +290,13 @@ public class AccountManager { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({VISIBILITY_UNDEFINED, VISIBILITY_VISIBLE, VISIBILITY_USER_MANAGED_VISIBLE, - VISIBILITY_NOT_VISIBLE, VISIBILITY_USER_MANAGED_NOT_VISIBLE}) + @IntDef(prefix = { "VISIBILITY_" }, value = { + VISIBILITY_UNDEFINED, + VISIBILITY_VISIBLE, + VISIBILITY_USER_MANAGED_VISIBLE, + VISIBILITY_NOT_VISIBLE, + VISIBILITY_USER_MANAGED_NOT_VISIBLE + }) public @interface AccountVisibility { } diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java index 0e8326de45ecf..04ff48cecdc01 100644 --- a/core/java/android/app/ActionBar.java +++ b/core/java/android/app/ActionBar.java @@ -95,7 +95,11 @@ import java.lang.annotation.RetentionPolicy; public abstract class ActionBar { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({NAVIGATION_MODE_STANDARD, NAVIGATION_MODE_LIST, NAVIGATION_MODE_TABS}) + @IntDef(prefix = { "NAVIGATION_MODE_" }, value = { + NAVIGATION_MODE_STANDARD, + NAVIGATION_MODE_LIST, + NAVIGATION_MODE_TABS + }) public @interface NavigationMode {} /** @@ -139,15 +143,14 @@ public abstract class ActionBar { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - DISPLAY_USE_LOGO, - DISPLAY_SHOW_HOME, - DISPLAY_HOME_AS_UP, - DISPLAY_SHOW_TITLE, - DISPLAY_SHOW_CUSTOM, - DISPLAY_TITLE_MULTIPLE_LINES - }) + @IntDef(flag = true, prefix = { "DISPLAY_" }, value = { + DISPLAY_USE_LOGO, + DISPLAY_SHOW_HOME, + DISPLAY_HOME_AS_UP, + DISPLAY_SHOW_TITLE, + DISPLAY_SHOW_CUSTOM, + DISPLAY_TITLE_MULTIPLE_LINES + }) public @interface DisplayOptions {} /** diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index e33b79e51fb69..58b4b14cb40da 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -175,7 +175,7 @@ public class ActivityManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "BUGREPORT_OPTION_" }, value = { BUGREPORT_OPTION_FULL, BUGREPORT_OPTION_INTERACTIVE, BUGREPORT_OPTION_REMOTE, diff --git a/core/java/android/app/FragmentTransaction.java b/core/java/android/app/FragmentTransaction.java index 0f4a7fb500a3b..1103649cb9a9f 100644 --- a/core/java/android/app/FragmentTransaction.java +++ b/core/java/android/app/FragmentTransaction.java @@ -182,7 +182,12 @@ public abstract class FragmentTransaction { public static final int TRANSIT_FRAGMENT_FADE = 3 | TRANSIT_ENTER_MASK; /** @hide */ - @IntDef({TRANSIT_NONE, TRANSIT_FRAGMENT_OPEN, TRANSIT_FRAGMENT_CLOSE, TRANSIT_FRAGMENT_FADE}) + @IntDef(prefix = { "TRANSIT_" }, value = { + TRANSIT_NONE, + TRANSIT_FRAGMENT_OPEN, + TRANSIT_FRAGMENT_CLOSE, + TRANSIT_FRAGMENT_FADE + }) @Retention(RetentionPolicy.SOURCE) public @interface Transit {} diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index fb9efe6f321d7..705f9a0513f60 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -577,7 +577,13 @@ public class Notification implements Parcelable public int flags; /** @hide */ - @IntDef({PRIORITY_DEFAULT,PRIORITY_LOW,PRIORITY_MIN,PRIORITY_HIGH,PRIORITY_MAX}) + @IntDef(prefix = { "PRIORITY_" }, value = { + PRIORITY_DEFAULT, + PRIORITY_LOW, + PRIORITY_MIN, + PRIORITY_HIGH, + PRIORITY_MAX + }) @Retention(RetentionPolicy.SOURCE) public @interface Priority {} diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 23c4166da1043..85a9be3558787 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -80,9 +80,14 @@ public class StatusBarManager { public static final int DISABLE2_MASK = DISABLE2_QUICK_SETTINGS | DISABLE2_SYSTEM_ICONS | DISABLE2_NOTIFICATION_SHADE | DISABLE2_GLOBAL_ACTIONS; - @IntDef(flag = true, - value = {DISABLE2_NONE, DISABLE2_MASK, DISABLE2_QUICK_SETTINGS, DISABLE2_SYSTEM_ICONS, - DISABLE2_NOTIFICATION_SHADE, DISABLE2_GLOBAL_ACTIONS}) + @IntDef(flag = true, prefix = { "DISABLE2_" }, value = { + DISABLE2_NONE, + DISABLE2_MASK, + DISABLE2_QUICK_SETTINGS, + DISABLE2_SYSTEM_ICONS, + DISABLE2_NOTIFICATION_SHADE, + DISABLE2_GLOBAL_ACTIONS + }) @Retention(RetentionPolicy.SOURCE) public @interface Disable2Flags {} diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index bc616686eceda..0da5e24929aa3 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -98,7 +98,11 @@ public class UiModeManager { public static String ACTION_EXIT_DESK_MODE = "android.app.action.EXIT_DESK_MODE"; /** @hide */ - @IntDef({MODE_NIGHT_AUTO, MODE_NIGHT_NO, MODE_NIGHT_YES}) + @IntDef(prefix = { "MODE_" }, value = { + MODE_NIGHT_AUTO, + MODE_NIGHT_NO, + MODE_NIGHT_YES + }) @Retention(RetentionPolicy.SOURCE) public @interface NightMode {} diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 081bd814b30ca..3829afb04eaa3 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -176,7 +176,7 @@ public class WallpaperManager { // flags for which kind of wallpaper to act on /** @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_SYSTEM, FLAG_LOCK }) diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index 80399ae65c583..085fc79f58e43 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -89,7 +89,7 @@ public class WindowConfiguration implements Parcelable, Comparable extends Parcelable { } /** @hide */ - @IntDef({MEDIUM_TYPE_BLUETOOTH, MEDIUM_TYPE_BLUETOOTH_LE, MEDIUM_TYPE_WIFI}) + @IntDef(prefix = { "MEDIUM_TYPE_" }, value = { + MEDIUM_TYPE_BLUETOOTH, + MEDIUM_TYPE_BLUETOOTH_LE, + MEDIUM_TYPE_WIFI + }) @Retention(RetentionPolicy.SOURCE) @interface MediumType {} } diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 9ccc552f77f57..8d2e141ae78fe 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -335,7 +335,7 @@ public abstract class ContentResolver { public static final String EXTRA_HONORED_ARGS = "android.content.extra.HONORED_ARGS"; /** @hide */ - @IntDef(flag = false, value = { + @IntDef(flag = false, prefix = { "QUERY_SORT_DIRECTION_" }, value = { QUERY_SORT_DIRECTION_ASCENDING, QUERY_SORT_DIRECTION_DESCENDING }) @@ -482,11 +482,10 @@ public abstract class ContentResolver { public static final int SYNC_OBSERVER_TYPE_ALL = 0x7fffffff; /** @hide */ - @IntDef(flag = true, - value = { - NOTIFY_SYNC_TO_NETWORK, - NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS - }) + @IntDef(flag = true, prefix = { "NOTIFY_" }, value = { + NOTIFY_SYNC_TO_NETWORK, + NOTIFY_SKIP_NOTIFY_FOR_DESCENDANTS + }) @Retention(RetentionPolicy.SOURCE) public @interface NotifyFlags {} diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a47433093988b..71d14d282f10d 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -219,17 +219,16 @@ public abstract class Context { public static final int MODE_NO_LOCALIZED_COLLATORS = 0x0010; /** @hide */ - @IntDef(flag = true, - value = { - BIND_AUTO_CREATE, - BIND_DEBUG_UNBIND, - BIND_NOT_FOREGROUND, - BIND_ABOVE_CLIENT, - BIND_ALLOW_OOM_MANAGEMENT, - BIND_WAIVE_PRIORITY, - BIND_IMPORTANT, - BIND_ADJUST_WITH_ACTIVITY - }) + @IntDef(flag = true, prefix = { "BIND_" }, value = { + BIND_AUTO_CREATE, + BIND_DEBUG_UNBIND, + BIND_NOT_FOREGROUND, + BIND_ABOVE_CLIENT, + BIND_ALLOW_OOM_MANAGEMENT, + BIND_WAIVE_PRIORITY, + BIND_IMPORTANT, + BIND_ADJUST_WITH_ACTIVITY + }) @Retention(RetentionPolicy.SOURCE) public @interface BindServiceFlags {} @@ -404,10 +403,9 @@ public abstract class Context { public static final int BIND_EXTERNAL_SERVICE = 0x80000000; /** @hide */ - @IntDef(flag = true, - value = { - RECEIVER_VISIBLE_TO_INSTANT_APPS - }) + @IntDef(flag = true, prefix = { "RECEIVER_VISIBLE_" }, value = { + RECEIVER_VISIBLE_TO_INSTANT_APPS + }) @Retention(RetentionPolicy.SOURCE) public @interface RegisterReceiverFlags {} diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 6fb1afde22eca..e940769ada60f 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5690,11 +5690,14 @@ public class Intent implements Parcelable, Cloneable { private static final int COPY_MODE_HISTORY = 2; /** @hide */ - @IntDef(value = {COPY_MODE_ALL, COPY_MODE_FILTER, COPY_MODE_HISTORY}) + @IntDef(prefix = { "COPY_MODE_" }, value = { + COPY_MODE_ALL, + COPY_MODE_FILTER, + COPY_MODE_HISTORY + }) @Retention(RetentionPolicy.SOURCE) public @interface CopyMode {} - /** * Create an empty intent. */ @@ -8966,17 +8969,16 @@ public class Intent implements Parcelable, Cloneable { } /** @hide */ - @IntDef(flag = true, - value = { - FILL_IN_ACTION, - FILL_IN_DATA, - FILL_IN_CATEGORIES, - FILL_IN_COMPONENT, - FILL_IN_PACKAGE, - FILL_IN_SOURCE_BOUNDS, - FILL_IN_SELECTOR, - FILL_IN_CLIP_DATA - }) + @IntDef(flag = true, prefix = { "FILL_IN_" }, value = { + FILL_IN_ACTION, + FILL_IN_DATA, + FILL_IN_CATEGORIES, + FILL_IN_COMPONENT, + FILL_IN_PACKAGE, + FILL_IN_SOURCE_BOUNDS, + FILL_IN_SELECTOR, + FILL_IN_CLIP_DATA + }) @Retention(RetentionPolicy.SOURCE) public @interface FillInFlags {} diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index f8cdce64c1398..14617116bc7f7 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -262,10 +262,10 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { public static final int COLOR_MODE_HDR = 2; /** @hide */ - @IntDef({ - COLOR_MODE_DEFAULT, - COLOR_MODE_WIDE_COLOR_GAMUT, - COLOR_MODE_HDR, + @IntDef(prefix = { "COLOR_MODE_" }, value = { + COLOR_MODE_DEFAULT, + COLOR_MODE_WIDE_COLOR_GAMUT, + COLOR_MODE_HDR, }) @Retention(RetentionPolicy.SOURCE) public @interface ColorMode {} @@ -492,7 +492,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { public int flags; /** @hide */ - @IntDef({ + @IntDef(prefix = { "SCREEN_ORIENTATION_" }, value = { SCREEN_ORIENTATION_UNSET, SCREEN_ORIENTATION_UNSPECIFIED, SCREEN_ORIENTATION_LANDSCAPE, @@ -638,25 +638,24 @@ public class ActivityInfo extends ComponentInfo implements Parcelable { public int screenOrientation = SCREEN_ORIENTATION_UNSPECIFIED; /** @hide */ - @IntDef(flag = true, - value = { - CONFIG_MCC, - CONFIG_MNC, - CONFIG_LOCALE, - CONFIG_TOUCHSCREEN, - CONFIG_KEYBOARD, - CONFIG_KEYBOARD_HIDDEN, - CONFIG_NAVIGATION, - CONFIG_ORIENTATION, - CONFIG_SCREEN_LAYOUT, - CONFIG_UI_MODE, - CONFIG_SCREEN_SIZE, - CONFIG_SMALLEST_SCREEN_SIZE, - CONFIG_DENSITY, - CONFIG_LAYOUT_DIRECTION, - CONFIG_COLOR_MODE, - CONFIG_FONT_SCALE, - }) + @IntDef(flag = true, prefix = { "CONFIG_" }, value = { + CONFIG_MCC, + CONFIG_MNC, + CONFIG_LOCALE, + CONFIG_TOUCHSCREEN, + CONFIG_KEYBOARD, + CONFIG_KEYBOARD_HIDDEN, + CONFIG_NAVIGATION, + CONFIG_ORIENTATION, + CONFIG_SCREEN_LAYOUT, + CONFIG_UI_MODE, + CONFIG_SCREEN_SIZE, + CONFIG_SMALLEST_SCREEN_SIZE, + CONFIG_DENSITY, + CONFIG_LAYOUT_DIRECTION, + CONFIG_COLOR_MODE, + CONFIG_FONT_SCALE, + }) @Retention(RetentionPolicy.SOURCE) public @interface Config {} diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index d09ba0b55a3c1..b4a7eec0fb4ca 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -343,14 +343,13 @@ public class LauncherApps { public static final int FLAG_GET_KEY_FIELDS_ONLY = 1 << 2; /** @hide */ - @IntDef(flag = true, - value = { - FLAG_MATCH_DYNAMIC, - FLAG_MATCH_PINNED, - FLAG_MATCH_MANIFEST, - FLAG_GET_KEY_FIELDS_ONLY, - FLAG_MATCH_MANIFEST, - }) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_MATCH_DYNAMIC, + FLAG_MATCH_PINNED, + FLAG_MATCH_MANIFEST, + FLAG_GET_KEY_FIELDS_ONLY, + FLAG_MATCH_MANIFEST, + }) @Retention(RetentionPolicy.SOURCE) public @interface QueryFlags {} @@ -1380,7 +1379,10 @@ public class LauncherApps { public static final int REQUEST_TYPE_APPWIDGET = 2; /** @hide */ - @IntDef(value = {REQUEST_TYPE_SHORTCUT}) + @IntDef(prefix = { "REQUEST_TYPE_" }, value = { + REQUEST_TYPE_SHORTCUT, + REQUEST_TYPE_APPWIDGET + }) @Retention(RetentionPolicy.SOURCE) public @interface RequestType {} diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java index 2f1b256dccdfe..33bc9515409f7 100644 --- a/core/java/android/content/pm/SharedLibraryInfo.java +++ b/core/java/android/content/pm/SharedLibraryInfo.java @@ -36,13 +36,11 @@ import java.util.List; public final class SharedLibraryInfo implements Parcelable { /** @hide */ - @IntDef( - flag = true, - value = { - TYPE_BUILTIN, - TYPE_DYNAMIC, - TYPE_STATIC, - }) + @IntDef(flag = true, prefix = { "TYPE_" }, value = { + TYPE_BUILTIN, + TYPE_DYNAMIC, + TYPE_STATIC, + }) @Retention(RetentionPolicy.SOURCE) @interface Type{} diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java index 9ff077576bfd5..8839cf9d35a75 100644 --- a/core/java/android/content/pm/ShortcutInfo.java +++ b/core/java/android/content/pm/ShortcutInfo.java @@ -109,8 +109,7 @@ public final class ShortcutInfo implements Parcelable { public static final int FLAG_SHADOW = 1 << 12; /** @hide */ - @IntDef(flag = true, - value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_DYNAMIC, FLAG_PINNED, FLAG_HAS_ICON_RES, @@ -153,15 +152,14 @@ public final class ShortcutInfo implements Parcelable { | CLONE_REMOVE_RES_NAMES; /** @hide */ - @IntDef(flag = true, - value = { - CLONE_REMOVE_ICON, - CLONE_REMOVE_INTENT, - CLONE_REMOVE_NON_KEY_INFO, - CLONE_REMOVE_RES_NAMES, - CLONE_REMOVE_FOR_CREATOR, - CLONE_REMOVE_FOR_LAUNCHER - }) + @IntDef(flag = true, prefix = { "CLONE_" }, value = { + CLONE_REMOVE_ICON, + CLONE_REMOVE_INTENT, + CLONE_REMOVE_NON_KEY_INFO, + CLONE_REMOVE_RES_NAMES, + CLONE_REMOVE_FOR_CREATOR, + CLONE_REMOVE_FOR_LAUNCHER + }) @Retention(RetentionPolicy.SOURCE) public @interface CloneFlags {} @@ -212,7 +210,7 @@ public final class ShortcutInfo implements Parcelable { public static final int DISABLED_REASON_OTHER_RESTORE_ISSUE = 103; /** @hide */ - @IntDef(value = { + @IntDef(prefix = { "DISABLED_REASON_" }, value = { DISABLED_REASON_NOT_DISABLED, DISABLED_REASON_BY_APP, DISABLED_REASON_APP_CHANGED, @@ -220,7 +218,7 @@ public final class ShortcutInfo implements Parcelable { DISABLED_REASON_BACKUP_NOT_SUPPORTED, DISABLED_REASON_SIGNATURE_MISMATCH, DISABLED_REASON_OTHER_RESTORE_ISSUE, - }) + }) @Retention(RetentionPolicy.SOURCE) public @interface DisabledReason{} diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 26efda108bb66..eb309799fe0f5 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -781,25 +781,24 @@ public final class Configuration implements Parcelable, Comparable { * Constants describing the type of a transaction through the Context Hub Service. */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "TYPE_" }, value = { TYPE_LOAD_NANOAPP, TYPE_UNLOAD_NANOAPP, TYPE_ENABLE_NANOAPP, TYPE_DISABLE_NANOAPP, - TYPE_QUERY_NANOAPPS}) - public @interface Type {} + TYPE_QUERY_NANOAPPS + }) + public @interface Type { } + public static final int TYPE_LOAD_NANOAPP = 0; public static final int TYPE_UNLOAD_NANOAPP = 1; public static final int TYPE_ENABLE_NANOAPP = 2; @@ -64,7 +66,7 @@ public class ContextHubTransaction { * Constants describing the result of a transaction or request through the Context Hub Service. */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "TRANSACTION_" }, value = { TRANSACTION_SUCCESS, TRANSACTION_FAILED_UNKNOWN, TRANSACTION_FAILED_BAD_PARAMS, @@ -73,7 +75,8 @@ public class ContextHubTransaction { TRANSACTION_FAILED_AT_HUB, TRANSACTION_FAILED_TIMEOUT, TRANSACTION_FAILED_SERVICE_INTERNAL_FAILURE, - TRANSACTION_FAILED_HAL_UNAVAILABLE}) + TRANSACTION_FAILED_HAL_UNAVAILABLE + }) public @interface Result {} public static final int TRANSACTION_SUCCESS = 0; /** diff --git a/core/java/android/os/HardwarePropertiesManager.java b/core/java/android/os/HardwarePropertiesManager.java index aad202e77710f..eae7d7014bb1b 100644 --- a/core/java/android/os/HardwarePropertiesManager.java +++ b/core/java/android/os/HardwarePropertiesManager.java @@ -40,9 +40,11 @@ public class HardwarePropertiesManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - DEVICE_TEMPERATURE_CPU, DEVICE_TEMPERATURE_GPU, DEVICE_TEMPERATURE_BATTERY, - DEVICE_TEMPERATURE_SKIN + @IntDef(prefix = { "DEVICE_TEMPERATURE_" }, value = { + DEVICE_TEMPERATURE_CPU, + DEVICE_TEMPERATURE_GPU, + DEVICE_TEMPERATURE_BATTERY, + DEVICE_TEMPERATURE_SKIN }) public @interface DeviceTemperatureType {} @@ -50,9 +52,11 @@ public class HardwarePropertiesManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - TEMPERATURE_CURRENT, TEMPERATURE_THROTTLING, TEMPERATURE_SHUTDOWN, - TEMPERATURE_THROTTLING_BELOW_VR_MIN + @IntDef(prefix = { "TEMPERATURE_" }, value = { + TEMPERATURE_CURRENT, + TEMPERATURE_THROTTLING, + TEMPERATURE_SHUTDOWN, + TEMPERATURE_THROTTLING_BELOW_VR_MIN }) public @interface TemperatureSource {} diff --git a/core/java/android/os/MessageQueue.java b/core/java/android/os/MessageQueue.java index 624e28a67ae6a..96e7a598ab73b 100644 --- a/core/java/android/os/MessageQueue.java +++ b/core/java/android/os/MessageQueue.java @@ -871,7 +871,11 @@ public final class MessageQueue { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={EVENT_INPUT, EVENT_OUTPUT, EVENT_ERROR}) + @IntDef(flag = true, prefix = { "EVENT_" }, value = { + EVENT_INPUT, + EVENT_OUTPUT, + EVENT_ERROR + }) public @interface Events {} /** diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 01fe5bfee6c78..56c6391356575 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -466,7 +466,7 @@ public final class PowerManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "SHUTDOWN_REASON_" }, value = { SHUTDOWN_REASON_UNKNOWN, SHUTDOWN_REASON_SHUTDOWN, SHUTDOWN_REASON_REBOOT, diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 61dd462f2e07c..fb60bbb483b16 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -103,8 +103,12 @@ public class UserManager { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={RESTRICTION_NOT_SET, RESTRICTION_SOURCE_SYSTEM, - RESTRICTION_SOURCE_DEVICE_OWNER, RESTRICTION_SOURCE_PROFILE_OWNER}) + @IntDef(flag = true, prefix = { "RESTRICTION_" }, value = { + RESTRICTION_NOT_SET, + RESTRICTION_SOURCE_SYSTEM, + RESTRICTION_SOURCE_DEVICE_OWNER, + RESTRICTION_SOURCE_PROFILE_OWNER + }) @SystemApi public @interface UserRestrictionSource {} diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 4796712f2d987..9833fe15dd3cd 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1690,7 +1690,7 @@ public class StorageManager { public static final int FLAG_ALLOCATE_DEFY_HALF_RESERVED = 1 << 2; /** @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_ALLOCATE_" }, value = { FLAG_ALLOCATE_AGGRESSIVE, FLAG_ALLOCATE_DEFY_ALL_RESERVED, FLAG_ALLOCATE_DEFY_HALF_RESERVED, diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index ce5b11ee33f10..f0d9a0cebbdb2 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -49,8 +49,9 @@ import java.util.Map; public final class PrintAttributes implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = { - COLOR_MODE_MONOCHROME, COLOR_MODE_COLOR + @IntDef(flag = true, prefix = { "COLOR_MODE_" }, value = { + COLOR_MODE_MONOCHROME, + COLOR_MODE_COLOR }) @interface ColorMode { } @@ -64,8 +65,10 @@ public final class PrintAttributes implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = { - DUPLEX_MODE_NONE, DUPLEX_MODE_LONG_EDGE, DUPLEX_MODE_SHORT_EDGE + @IntDef(flag = true, prefix = { "DUPLEX_MODE_" }, value = { + DUPLEX_MODE_NONE, + DUPLEX_MODE_LONG_EDGE, + DUPLEX_MODE_SHORT_EDGE }) @interface DuplexMode { } diff --git a/core/java/android/print/PrintDocumentInfo.java b/core/java/android/print/PrintDocumentInfo.java index 61434041ff5a3..55c902e19c358 100644 --- a/core/java/android/print/PrintDocumentInfo.java +++ b/core/java/android/print/PrintDocumentInfo.java @@ -83,11 +83,14 @@ public final class PrintDocumentInfo implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ - CONTENT_TYPE_UNKNOWN, CONTENT_TYPE_DOCUMENT, CONTENT_TYPE_PHOTO + @IntDef(prefix = { "CONTENT_TYPE_" }, value = { + CONTENT_TYPE_UNKNOWN, + CONTENT_TYPE_DOCUMENT, + CONTENT_TYPE_PHOTO }) public @interface ContentType { } + /** * Content type: unknown. */ diff --git a/core/java/android/print/PrintJobInfo.java b/core/java/android/print/PrintJobInfo.java index 94686a8ee456f..85fdd642095cf 100644 --- a/core/java/android/print/PrintJobInfo.java +++ b/core/java/android/print/PrintJobInfo.java @@ -45,9 +45,14 @@ import java.util.Arrays; public final class PrintJobInfo implements Parcelable { /** @hide */ - @IntDef({ - STATE_CREATED, STATE_QUEUED, STATE_STARTED, STATE_BLOCKED, STATE_COMPLETED, - STATE_FAILED, STATE_CANCELED + @IntDef(prefix = { "STATE_" }, value = { + STATE_CREATED, + STATE_QUEUED, + STATE_STARTED, + STATE_BLOCKED, + STATE_COMPLETED, + STATE_FAILED, + STATE_CANCELED }) @Retention(RetentionPolicy.SOURCE) public @interface State { diff --git a/core/java/android/print/PrinterInfo.java b/core/java/android/print/PrinterInfo.java index 88feab7fc2ca9..e79cc651c48bf 100644 --- a/core/java/android/print/PrinterInfo.java +++ b/core/java/android/print/PrinterInfo.java @@ -53,12 +53,15 @@ import java.lang.annotation.RetentionPolicy; public final class PrinterInfo implements Parcelable { /** @hide */ - @IntDef({ - STATUS_IDLE, STATUS_BUSY, STATUS_UNAVAILABLE + @IntDef(prefix = { "STATUS_" }, value = { + STATUS_IDLE, + STATUS_BUSY, + STATUS_UNAVAILABLE }) @Retention(RetentionPolicy.SOURCE) public @interface Status { } + /** Printer status: the printer is idle and ready to print. */ public static final int STATUS_IDLE = PrinterInfoProto.STATUS_IDLE; diff --git a/core/java/android/provider/FontsContract.java b/core/java/android/provider/FontsContract.java index d8540ffd639a5..a1d1c57361162 100644 --- a/core/java/android/provider/FontsContract.java +++ b/core/java/android/provider/FontsContract.java @@ -283,7 +283,11 @@ public class FontsContract { public static final int STATUS_REJECTED = 3; /** @hide */ - @IntDef({STATUS_OK, STATUS_WRONG_CERTIFICATES, STATUS_UNEXPECTED_DATA_PROVIDED}) + @IntDef(prefix = { "STATUS_" }, value = { + STATUS_OK, + STATUS_WRONG_CERTIFICATES, + STATUS_UNEXPECTED_DATA_PROVIDED + }) @Retention(RetentionPolicy.SOURCE) @interface FontResultStatus {} @@ -438,9 +442,13 @@ public class FontsContract { public static final int FAIL_REASON_MALFORMED_QUERY = Columns.RESULT_CODE_MALFORMED_QUERY; /** @hide */ - @IntDef({ FAIL_REASON_PROVIDER_NOT_FOUND, FAIL_REASON_FONT_LOAD_ERROR, - FAIL_REASON_FONT_NOT_FOUND, FAIL_REASON_FONT_UNAVAILABLE, - FAIL_REASON_MALFORMED_QUERY }) + @IntDef(prefix = { "FAIL_" }, value = { + FAIL_REASON_PROVIDER_NOT_FOUND, + FAIL_REASON_FONT_LOAD_ERROR, + FAIL_REASON_FONT_NOT_FOUND, + FAIL_REASON_FONT_UNAVAILABLE, + FAIL_REASON_MALFORMED_QUERY + }) @Retention(RetentionPolicy.SOURCE) @interface FontRequestFailReason {} diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6b1632a0a693f..19e08b53ba92a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1689,7 +1689,7 @@ public final class Settings { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({ + @IntDef(prefix = { "RESET_MODE_" }, value = { RESET_MODE_PACKAGE_DEFAULTS, RESET_MODE_UNTRUSTED_DEFAULTS, RESET_MODE_UNTRUSTED_CHANGES, diff --git a/core/java/android/service/autofill/FillEventHistory.java b/core/java/android/service/autofill/FillEventHistory.java index facad2d1ab30b..a527f16105b96 100644 --- a/core/java/android/service/autofill/FillEventHistory.java +++ b/core/java/android/service/autofill/FillEventHistory.java @@ -226,12 +226,13 @@ public final class FillEventHistory implements Parcelable { public static final int TYPE_CONTEXT_COMMITTED = 4; /** @hide */ - @IntDef( - value = {TYPE_DATASET_SELECTED, - TYPE_DATASET_AUTHENTICATION_SELECTED, - TYPE_AUTHENTICATION_SELECTED, - TYPE_SAVE_SHOWN, - TYPE_CONTEXT_COMMITTED}) + @IntDef(prefix = { "TYPE_" }, value = { + TYPE_DATASET_SELECTED, + TYPE_DATASET_AUTHENTICATION_SELECTED, + TYPE_AUTHENTICATION_SELECTED, + TYPE_SAVE_SHOWN, + TYPE_CONTEXT_COMMITTED + }) @Retention(RetentionPolicy.SOURCE) @interface EventIds{} diff --git a/core/java/android/service/autofill/FillRequest.java b/core/java/android/service/autofill/FillRequest.java index ddc92f6a656f5..33619ac68cf0f 100644 --- a/core/java/android/service/autofill/FillRequest.java +++ b/core/java/android/service/autofill/FillRequest.java @@ -69,9 +69,9 @@ public final class FillRequest implements Parcelable { public static final int INVALID_REQUEST_ID = Integer.MIN_VALUE; /** @hide */ - @IntDef( - flag = true, - value = {FLAG_MANUAL_REQUEST}) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_MANUAL_REQUEST + }) @Retention(RetentionPolicy.SOURCE) @interface RequestFlags{} diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index 04db69845c863..014d3e8c42c9c 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -63,7 +63,7 @@ public final class FillResponse implements Parcelable { public static final int FLAG_DISABLE_ACTIVITY_ONLY = 0x2; /** @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_TRACK_CONTEXT_COMMITED, FLAG_DISABLE_ACTIVITY_ONLY }) diff --git a/core/java/android/service/autofill/SaveInfo.java b/core/java/android/service/autofill/SaveInfo.java index 0b50f074c4c13..a5a6177dedc39 100644 --- a/core/java/android/service/autofill/SaveInfo.java +++ b/core/java/android/service/autofill/SaveInfo.java @@ -198,23 +198,22 @@ public final class SaveInfo implements Parcelable { public static final int NEGATIVE_BUTTON_STYLE_REJECT = 1; /** @hide */ - @IntDef( - value = { - NEGATIVE_BUTTON_STYLE_CANCEL, - NEGATIVE_BUTTON_STYLE_REJECT}) + @IntDef(prefix = { "NEGATIVE_BUTTON_STYLE_" }, value = { + NEGATIVE_BUTTON_STYLE_CANCEL, + NEGATIVE_BUTTON_STYLE_REJECT + }) @Retention(RetentionPolicy.SOURCE) @interface NegativeButtonStyle{} /** @hide */ - @IntDef( - flag = true, - value = { - SAVE_DATA_TYPE_GENERIC, - SAVE_DATA_TYPE_PASSWORD, - SAVE_DATA_TYPE_ADDRESS, - SAVE_DATA_TYPE_CREDIT_CARD, - SAVE_DATA_TYPE_USERNAME, - SAVE_DATA_TYPE_EMAIL_ADDRESS}) + @IntDef(flag = true, prefix = { "SAVE_DATA_TYPE_" }, value = { + SAVE_DATA_TYPE_GENERIC, + SAVE_DATA_TYPE_PASSWORD, + SAVE_DATA_TYPE_ADDRESS, + SAVE_DATA_TYPE_CREDIT_CARD, + SAVE_DATA_TYPE_USERNAME, + SAVE_DATA_TYPE_EMAIL_ADDRESS + }) @Retention(RetentionPolicy.SOURCE) @interface SaveDataType{} @@ -235,9 +234,10 @@ public final class SaveInfo implements Parcelable { public static final int FLAG_DONT_SAVE_ON_FINISH = 0x2; /** @hide */ - @IntDef( - flag = true, - value = {FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE, FLAG_DONT_SAVE_ON_FINISH}) + @IntDef(flag = true, prefix = { "FLAG_" }, value = { + FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE, + FLAG_DONT_SAVE_ON_FINISH + }) @Retention(RetentionPolicy.SOURCE) @interface SaveInfoFlags{} diff --git a/core/java/android/service/notification/Condition.java b/core/java/android/service/notification/Condition.java index 447afe62fd1a9..2a352adcee18a 100644 --- a/core/java/android/service/notification/Condition.java +++ b/core/java/android/service/notification/Condition.java @@ -39,7 +39,12 @@ public final class Condition implements Parcelable { public static final String SCHEME = "condition"; /** @hide */ - @IntDef({STATE_FALSE, STATE_TRUE, STATE_TRUE, STATE_ERROR}) + @IntDef(prefix = { "STATE_" }, value = { + STATE_FALSE, + STATE_TRUE, + STATE_UNKNOWN, + STATE_ERROR + }) @Retention(RetentionPolicy.SOURCE) public @interface State {} diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index dac663e765eaa..18d4a1e638049 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -229,8 +229,11 @@ public abstract class NotificationListenerService extends Service { /** @hide */ - @IntDef({NOTIFICATION_CHANNEL_OR_GROUP_ADDED, NOTIFICATION_CHANNEL_OR_GROUP_UPDATED, - NOTIFICATION_CHANNEL_OR_GROUP_DELETED}) + @IntDef(prefix = { "NOTIFICATION_CHANNEL_OR_GROUP_" }, value = { + NOTIFICATION_CHANNEL_OR_GROUP_ADDED, + NOTIFICATION_CHANNEL_OR_GROUP_UPDATED, + NOTIFICATION_CHANNEL_OR_GROUP_DELETED + }) @Retention(RetentionPolicy.SOURCE) public @interface ChannelOrGroupModificationTypes {} diff --git a/core/java/android/service/persistentdata/PersistentDataBlockManager.java b/core/java/android/service/persistentdata/PersistentDataBlockManager.java index 9332a5be78ccc..0bf68b734b8ac 100644 --- a/core/java/android/service/persistentdata/PersistentDataBlockManager.java +++ b/core/java/android/service/persistentdata/PersistentDataBlockManager.java @@ -65,10 +65,10 @@ public class PersistentDataBlockManager { */ public static final int FLASH_LOCK_LOCKED = 1; - @IntDef({ - FLASH_LOCK_UNKNOWN, - FLASH_LOCK_LOCKED, - FLASH_LOCK_UNLOCKED, + @IntDef(prefix = { "FLASH_LOCK_" }, value = { + FLASH_LOCK_UNKNOWN, + FLASH_LOCK_LOCKED, + FLASH_LOCK_UNLOCKED, }) @Retention(RetentionPolicy.SOURCE) public @interface FlashLockState {} diff --git a/core/java/android/service/settings/suggestions/Suggestion.java b/core/java/android/service/settings/suggestions/Suggestion.java index cfeb7fcead389..11e1e674a7470 100644 --- a/core/java/android/service/settings/suggestions/Suggestion.java +++ b/core/java/android/service/settings/suggestions/Suggestion.java @@ -38,7 +38,7 @@ public final class Suggestion implements Parcelable { /** * @hide */ - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "FLAG_" }, value = { FLAG_HAS_BUTTON, }) @Retention(RetentionPolicy.SOURCE) diff --git a/core/java/android/service/trust/TrustAgentService.java b/core/java/android/service/trust/TrustAgentService.java index 5ef934ed88e35..4bade9f9f9cae 100644 --- a/core/java/android/service/trust/TrustAgentService.java +++ b/core/java/android/service/trust/TrustAgentService.java @@ -114,11 +114,10 @@ public class TrustAgentService extends Service { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - FLAG_GRANT_TRUST_INITIATED_BY_USER, - FLAG_GRANT_TRUST_DISMISS_KEYGUARD, - }) + @IntDef(flag = true, prefix = { "FLAG_GRANT_TRUST_" }, value = { + FLAG_GRANT_TRUST_INITIATED_BY_USER, + FLAG_GRANT_TRUST_DISMISS_KEYGUARD, + }) public @interface GrantTrustFlags {} @@ -138,11 +137,10 @@ public class TrustAgentService extends Service { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - TOKEN_STATE_ACTIVE, - TOKEN_STATE_INACTIVE, - }) + @IntDef(flag = true, prefix = { "TOKEN_STATE_" }, value = { + TOKEN_STATE_ACTIVE, + TOKEN_STATE_INACTIVE, + }) public @interface TokenState {} private static final int MSG_UNLOCK_ATTEMPT = 1; diff --git a/core/java/android/service/voice/AlwaysOnHotwordDetector.java b/core/java/android/service/voice/AlwaysOnHotwordDetector.java index 9464a8754fa82..76d89ef039c81 100644 --- a/core/java/android/service/voice/AlwaysOnHotwordDetector.java +++ b/core/java/android/service/voice/AlwaysOnHotwordDetector.java @@ -87,11 +87,11 @@ public class AlwaysOnHotwordDetector { // Keyphrase management actions. Used in getManageIntent() ----// @Retention(RetentionPolicy.SOURCE) - @IntDef(value = { - MANAGE_ACTION_ENROLL, - MANAGE_ACTION_RE_ENROLL, - MANAGE_ACTION_UN_ENROLL - }) + @IntDef(prefix = { "MANAGE_ACTION_" }, value = { + MANAGE_ACTION_ENROLL, + MANAGE_ACTION_RE_ENROLL, + MANAGE_ACTION_UN_ENROLL + }) private @interface ManageActions {} /** @@ -116,12 +116,11 @@ public class AlwaysOnHotwordDetector { //-- Flags for startRecognition ----// /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - RECOGNITION_FLAG_NONE, - RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO, - RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS - }) + @IntDef(flag = true, prefix = { "RECOGNITION_FLAG_" }, value = { + RECOGNITION_FLAG_NONE, + RECOGNITION_FLAG_CAPTURE_TRIGGER_AUDIO, + RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS + }) public @interface RecognitionFlags {} /** @@ -150,11 +149,10 @@ public class AlwaysOnHotwordDetector { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - RECOGNITION_MODE_VOICE_TRIGGER, - RECOGNITION_MODE_USER_IDENTIFICATION, - }) + @IntDef(flag = true, prefix = { "RECOGNITION_MODE_" }, value = { + RECOGNITION_MODE_VOICE_TRIGGER, + RECOGNITION_MODE_USER_IDENTIFICATION, + }) public @interface RecognitionModes {} /** diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index 763ea2ca3859e..01562b328ecce 100644 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -80,8 +80,15 @@ public class TextToSpeech { public static final int STOPPED = -2; /** @hide */ - @IntDef({ERROR_SYNTHESIS, ERROR_SERVICE, ERROR_OUTPUT, ERROR_NETWORK, ERROR_NETWORK_TIMEOUT, - ERROR_INVALID_REQUEST, ERROR_NOT_INSTALLED_YET}) + @IntDef(prefix = { "ERROR_" }, value = { + ERROR_SYNTHESIS, + ERROR_SERVICE, + ERROR_OUTPUT, + ERROR_NETWORK, + ERROR_NETWORK_TIMEOUT, + ERROR_INVALID_REQUEST, + ERROR_NOT_INSTALLED_YET + }) @Retention(RetentionPolicy.SOURCE) public @interface Error {} diff --git a/core/java/android/text/FontConfig.java b/core/java/android/text/FontConfig.java index 4654e83c1af61..7386e3e885614 100644 --- a/core/java/android/text/FontConfig.java +++ b/core/java/android/text/FontConfig.java @@ -179,7 +179,11 @@ public final class FontConfig { /** @hide */ @Retention(SOURCE) - @IntDef({VARIANT_DEFAULT, VARIANT_COMPACT, VARIANT_ELEGANT}) + @IntDef(prefix = { "VARIANT_" }, value = { + VARIANT_DEFAULT, + VARIANT_COMPACT, + VARIANT_ELEGANT + }) public @interface Variant {} /** diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index 2a693a1841e65..bf4b6ac5194f5 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -48,7 +48,11 @@ import java.util.Arrays; */ public abstract class Layout { /** @hide */ - @IntDef({BREAK_STRATEGY_SIMPLE, BREAK_STRATEGY_HIGH_QUALITY, BREAK_STRATEGY_BALANCED}) + @IntDef(prefix = { "BREAK_STRATEGY_" }, value = { + BREAK_STRATEGY_SIMPLE, + BREAK_STRATEGY_HIGH_QUALITY, + BREAK_STRATEGY_BALANCED + }) @Retention(RetentionPolicy.SOURCE) public @interface BreakStrategy {} @@ -73,8 +77,11 @@ public abstract class Layout { public static final int BREAK_STRATEGY_BALANCED = 2; /** @hide */ - @IntDef({HYPHENATION_FREQUENCY_NORMAL, HYPHENATION_FREQUENCY_FULL, - HYPHENATION_FREQUENCY_NONE}) + @IntDef(prefix = { "HYPHENATION_FREQUENCY_" }, value = { + HYPHENATION_FREQUENCY_NORMAL, + HYPHENATION_FREQUENCY_FULL, + HYPHENATION_FREQUENCY_NONE + }) @Retention(RetentionPolicy.SOURCE) public @interface HyphenationFrequency {} @@ -105,7 +112,10 @@ public abstract class Layout { ArrayUtils.emptyArray(ParagraphStyle.class); /** @hide */ - @IntDef({JUSTIFICATION_MODE_NONE, JUSTIFICATION_MODE_INTER_WORD}) + @IntDef(prefix = { "JUSTIFICATION_MODE_" }, value = { + JUSTIFICATION_MODE_NONE, + JUSTIFICATION_MODE_INTER_WORD + }) @Retention(RetentionPolicy.SOURCE) public @interface JustificationMode {} @@ -2267,7 +2277,10 @@ public abstract class Layout { private int mJustificationMode; /** @hide */ - @IntDef({DIR_LEFT_TO_RIGHT, DIR_RIGHT_TO_LEFT}) + @IntDef(prefix = { "DIR_" }, value = { + DIR_LEFT_TO_RIGHT, + DIR_RIGHT_TO_LEFT + }) @Retention(RetentionPolicy.SOURCE) public @interface Direction {} @@ -2308,7 +2321,10 @@ public abstract class Layout { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({TEXT_SELECTION_LAYOUT_RIGHT_TO_LEFT, TEXT_SELECTION_LAYOUT_LEFT_TO_RIGHT}) + @IntDef(prefix = { "TEXT_SELECTION_LAYOUT_" }, value = { + TEXT_SELECTION_LAYOUT_RIGHT_TO_LEFT, + TEXT_SELECTION_LAYOUT_LEFT_TO_RIGHT + }) public @interface TextSelectionLayout {} /** @hide */ diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java index 5b851caa63445..f0838a169a455 100644 --- a/core/java/android/transition/Visibility.java +++ b/core/java/android/transition/Visibility.java @@ -52,7 +52,10 @@ public abstract class Visibility extends Transition { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag=true, value={MODE_IN, MODE_OUT}) + @IntDef(flag = true, prefix = { "MODE_" }, value = { + MODE_IN, + MODE_OUT + }) @interface VisibilityMode {} /** diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 9673be01d7fbb..5bd7446d08b69 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -1323,10 +1323,10 @@ public final class Display { public static final int HDR_TYPE_HLG = 3; /** @hide */ - @IntDef({ - HDR_TYPE_DOLBY_VISION, - HDR_TYPE_HDR10, - HDR_TYPE_HLG, + @IntDef(prefix = { "HDR_TYPE_" }, value = { + HDR_TYPE_DOLBY_VISION, + HDR_TYPE_HDR10, + HDR_TYPE_HLG, }) @Retention(RetentionPolicy.SOURCE) public @interface HdrType {} diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index ddced6cdd83fb..a417a4a04e2fb 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -121,8 +121,12 @@ public class Surface implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({SCALING_MODE_FREEZE, SCALING_MODE_SCALE_TO_WINDOW, - SCALING_MODE_SCALE_CROP, SCALING_MODE_NO_SCALE_CROP}) + @IntDef(prefix = { "SCALING_MODE_" }, value = { + SCALING_MODE_FREEZE, + SCALING_MODE_SCALE_TO_WINDOW, + SCALING_MODE_SCALE_CROP, + SCALING_MODE_NO_SCALE_CROP + }) public @interface ScalingMode {} // From system/window.h /** @hide */ @@ -135,7 +139,12 @@ public class Surface implements Parcelable { public static final int SCALING_MODE_NO_SCALE_CROP = 3; /** @hide */ - @IntDef({ROTATION_0, ROTATION_90, ROTATION_180, ROTATION_270}) + @IntDef(prefix = { "ROTATION_" }, value = { + ROTATION_0, + ROTATION_90, + ROTATION_180, + ROTATION_270 + }) @Retention(RetentionPolicy.SOURCE) public @interface Rotation {} diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 0a69772c3606f..6a8f8b120ef16 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -344,8 +344,10 @@ public final class ThreadedRenderer { private static final int FLAG_DUMP_FRAMESTATS = 1 << 0; private static final int FLAG_DUMP_RESET = 1 << 1; - @IntDef(flag = true, value = { - FLAG_DUMP_FRAMESTATS, FLAG_DUMP_RESET }) + @IntDef(flag = true, prefix = { "FLAG_DUMP_" }, value = { + FLAG_DUMP_FRAMESTATS, + FLAG_DUMP_RESET + }) @Retention(RetentionPolicy.SOURCE) public @interface DumpFlags {} diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 623759e178d8f..ab5372a6b0aca 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -1178,7 +1178,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, private AutofillId mAutofillId; /** @hide */ - @IntDef({ + @IntDef(prefix = { "AUTOFILL_TYPE_" }, value = { AUTOFILL_TYPE_NONE, AUTOFILL_TYPE_TEXT, AUTOFILL_TYPE_TOGGLE, @@ -1249,7 +1249,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int AUTOFILL_TYPE_DATE = 4; /** @hide */ - @IntDef({ + @IntDef(prefix = { "IMPORTANT_FOR_AUTOFILL_" }, value = { IMPORTANT_FOR_AUTOFILL_AUTO, IMPORTANT_FOR_AUTOFILL_YES, IMPORTANT_FOR_AUTOFILL_NO, @@ -1300,9 +1300,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS = 0x8; /** @hide */ - @IntDef( - flag = true, - value = {AUTOFILL_FLAG_INCLUDE_NOT_IMPORTANT_VIEWS}) + @IntDef(flag = true, prefix = { "AUTOFILL_FLAG_" }, value = { + AUTOFILL_FLAG_INCLUDE_NOT_IMPORTANT_VIEWS + }) @Retention(RetentionPolicy.SOURCE) public @interface AutofillFlags {} @@ -1452,7 +1452,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef({DRAWING_CACHE_QUALITY_LOW, DRAWING_CACHE_QUALITY_HIGH, DRAWING_CACHE_QUALITY_AUTO}) + @IntDef(prefix = { "DRAWING_CACHE_QUALITY_" }, value = { + DRAWING_CACHE_QUALITY_LOW, + DRAWING_CACHE_QUALITY_HIGH, + DRAWING_CACHE_QUALITY_AUTO + }) public @interface DrawingCacheQuality {} /** @@ -1551,13 +1555,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ static final int CONTEXT_CLICKABLE = 0x00800000; - /** @hide */ - @IntDef({ - SCROLLBARS_INSIDE_OVERLAY, - SCROLLBARS_INSIDE_INSET, - SCROLLBARS_OUTSIDE_OVERLAY, - SCROLLBARS_OUTSIDE_INSET + @IntDef(prefix = { "SCROLLBARS_" }, value = { + SCROLLBARS_INSIDE_OVERLAY, + SCROLLBARS_INSIDE_INSET, + SCROLLBARS_OUTSIDE_OVERLAY, + SCROLLBARS_OUTSIDE_INSET }) @Retention(RetentionPolicy.SOURCE) public @interface ScrollBarStyle {} @@ -1651,11 +1654,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, static final int TOOLTIP = 0x40000000; /** @hide */ - @IntDef(flag = true, - value = { - FOCUSABLES_ALL, - FOCUSABLES_TOUCH_MODE - }) + @IntDef(flag = true, prefix = { "FOCUSABLES_" }, value = { + FOCUSABLES_ALL, + FOCUSABLES_TOUCH_MODE + }) @Retention(RetentionPolicy.SOURCE) public @interface FocusableMode {} @@ -1672,7 +1674,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int FOCUSABLES_TOUCH_MODE = 0x00000001; /** @hide */ - @IntDef({ + @IntDef(prefix = { "FOCUS_" }, value = { FOCUS_BACKWARD, FOCUS_FORWARD, FOCUS_LEFT, @@ -1684,7 +1686,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public @interface FocusDirection {} /** @hide */ - @IntDef({ + @IntDef(prefix = { "FOCUS_" }, value = { FOCUS_LEFT, FOCUS_UP, FOCUS_RIGHT, @@ -2426,20 +2428,20 @@ public class View implements Drawable.Callback, KeyEvent.Callback, static final int PFLAG2_DRAG_HOVERED = 0x00000002; /** @hide */ - @IntDef({ - LAYOUT_DIRECTION_LTR, - LAYOUT_DIRECTION_RTL, - LAYOUT_DIRECTION_INHERIT, - LAYOUT_DIRECTION_LOCALE + @IntDef(prefix = { "LAYOUT_DIRECTION_" }, value = { + LAYOUT_DIRECTION_LTR, + LAYOUT_DIRECTION_RTL, + LAYOUT_DIRECTION_INHERIT, + LAYOUT_DIRECTION_LOCALE }) @Retention(RetentionPolicy.SOURCE) // Not called LayoutDirection to avoid conflict with android.util.LayoutDirection public @interface LayoutDir {} /** @hide */ - @IntDef({ - LAYOUT_DIRECTION_LTR, - LAYOUT_DIRECTION_RTL + @IntDef(prefix = { "LAYOUT_DIRECTION_" }, value = { + LAYOUT_DIRECTION_LTR, + LAYOUT_DIRECTION_RTL }) @Retention(RetentionPolicy.SOURCE) public @interface ResolvedLayoutDir {} @@ -2645,14 +2647,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, TEXT_DIRECTION_RESOLVED_DEFAULT << PFLAG2_TEXT_DIRECTION_RESOLVED_MASK_SHIFT; /** @hide */ - @IntDef({ - TEXT_ALIGNMENT_INHERIT, - TEXT_ALIGNMENT_GRAVITY, - TEXT_ALIGNMENT_CENTER, - TEXT_ALIGNMENT_TEXT_START, - TEXT_ALIGNMENT_TEXT_END, - TEXT_ALIGNMENT_VIEW_START, - TEXT_ALIGNMENT_VIEW_END + @IntDef(prefix = { "TEXT_ALIGNMENT_" }, value = { + TEXT_ALIGNMENT_INHERIT, + TEXT_ALIGNMENT_GRAVITY, + TEXT_ALIGNMENT_CENTER, + TEXT_ALIGNMENT_TEXT_START, + TEXT_ALIGNMENT_TEXT_END, + TEXT_ALIGNMENT_VIEW_START, + TEXT_ALIGNMENT_VIEW_END }) @Retention(RetentionPolicy.SOURCE) public @interface TextAlignment {} @@ -3049,15 +3051,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, /** @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, - value = { - SCROLL_INDICATOR_TOP, - SCROLL_INDICATOR_BOTTOM, - SCROLL_INDICATOR_LEFT, - SCROLL_INDICATOR_RIGHT, - SCROLL_INDICATOR_START, - SCROLL_INDICATOR_END, - }) + @IntDef(flag = true, prefix = { "SCROLL_INDICATOR_" }, value = { + SCROLL_INDICATOR_TOP, + SCROLL_INDICATOR_BOTTOM, + SCROLL_INDICATOR_LEFT, + SCROLL_INDICATOR_RIGHT, + SCROLL_INDICATOR_START, + SCROLL_INDICATOR_END, + }) public @interface ScrollIndicators {} /** @@ -3683,8 +3684,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; /** @hide */ - @IntDef(flag = true, - value = { FIND_VIEWS_WITH_TEXT, FIND_VIEWS_WITH_CONTENT_DESCRIPTION }) + @IntDef(flag = true, prefix = { "FIND_VIEWS_" }, value = { + FIND_VIEWS_WITH_TEXT, + FIND_VIEWS_WITH_CONTENT_DESCRIPTION + }) @Retention(RetentionPolicy.SOURCE) public @interface FindViewFlags {} diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 500701de7f23e..7ebd2a1c5aa20 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1738,7 +1738,7 @@ public interface WindowManager extends ViewManager { * @hide */ @Retention(RetentionPolicy.SOURCE) - @IntDef(flag = true, value = { + @IntDef(flag = true, prefix = { "SOFT_INPUT_" }, value = { SOFT_INPUT_STATE_UNSPECIFIED, SOFT_INPUT_STATE_UNCHANGED, SOFT_INPUT_STATE_HIDDEN, diff --git a/core/java/android/view/accessibility/AccessibilityRequestPreparer.java b/core/java/android/view/accessibility/AccessibilityRequestPreparer.java index 889feb983be43..25f830a5e55b0 100644 --- a/core/java/android/view/accessibility/AccessibilityRequestPreparer.java +++ b/core/java/android/view/accessibility/AccessibilityRequestPreparer.java @@ -44,10 +44,9 @@ public abstract class AccessibilityRequestPreparer { public static final int REQUEST_TYPE_EXTRA_DATA = 0x00000001; /** @hide */ - @IntDef(flag = true, - value = { - REQUEST_TYPE_EXTRA_DATA - }) + @IntDef(flag = true, prefix = { "REQUEST_TYPE_" }, value = { + REQUEST_TYPE_EXTRA_DATA + }) @Retention(RetentionPolicy.SOURCE) public @interface RequestTypes {} diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index 419aeb3507a6e..6d84aa009c75e 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -1987,7 +1987,11 @@ public final class AutofillManager { public abstract static class AutofillCallback { /** @hide */ - @IntDef({EVENT_INPUT_SHOWN, EVENT_INPUT_HIDDEN, EVENT_INPUT_UNAVAILABLE}) + @IntDef(prefix = { "EVENT_INPUT_" }, value = { + EVENT_INPUT_SHOWN, + EVENT_INPUT_HIDDEN, + EVENT_INPUT_UNAVAILABLE + }) @Retention(RetentionPolicy.SOURCE) public @interface AutofillEventType {} diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index e49373923ec92..90cc481483ede 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -122,7 +122,13 @@ public abstract class WebSettings { } /** @hide */ - @IntDef({LOAD_DEFAULT, LOAD_NORMAL, LOAD_CACHE_ELSE_NETWORK, LOAD_NO_CACHE, LOAD_CACHE_ONLY}) + @IntDef(prefix = { "LOAD_" }, value = { + LOAD_DEFAULT, + LOAD_NORMAL, + LOAD_CACHE_ELSE_NETWORK, + LOAD_NO_CACHE, + LOAD_CACHE_ONLY + }) @Retention(RetentionPolicy.SOURCE) public @interface CacheMode {} @@ -1415,13 +1421,12 @@ public abstract class WebSettings { /** * @hide */ - @IntDef(flag = true, - value = { - MENU_ITEM_NONE, - MENU_ITEM_SHARE, - MENU_ITEM_WEB_SEARCH, - MENU_ITEM_PROCESS_TEXT - }) + @IntDef(flag = true, prefix = { "MENU_ITEM_" }, value = { + MENU_ITEM_NONE, + MENU_ITEM_SHARE, + MENU_ITEM_WEB_SEARCH, + MENU_ITEM_PROCESS_TEXT + }) @Retention(RetentionPolicy.SOURCE) @Target({ElementType.PARAMETER, ElementType.METHOD}) private @interface MenuItemFlags {} diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 6f9925480a22d..d39c1e18b2ace 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2249,10 +2249,10 @@ public class WebView extends AbsoluteLayout } /** @hide */ - @IntDef({ - RENDERER_PRIORITY_WAIVED, - RENDERER_PRIORITY_BOUND, - RENDERER_PRIORITY_IMPORTANT + @IntDef(prefix = { "RENDERER_PRIORITY_" }, value = { + RENDERER_PRIORITY_WAIVED, + RENDERER_PRIORITY_BOUND, + RENDERER_PRIORITY_IMPORTANT }) @Retention(RetentionPolicy.SOURCE) public @interface RendererPriority {} diff --git a/core/java/android/webkit/WebViewClient.java b/core/java/android/webkit/WebViewClient.java index 46c39834060bd..d0f9eee39a03f 100644 --- a/core/java/android/webkit/WebViewClient.java +++ b/core/java/android/webkit/WebViewClient.java @@ -256,11 +256,11 @@ public class WebViewClient { public static final int ERROR_UNSAFE_RESOURCE = -16; /** @hide */ - @IntDef({ - SAFE_BROWSING_THREAT_UNKNOWN, - SAFE_BROWSING_THREAT_MALWARE, - SAFE_BROWSING_THREAT_PHISHING, - SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE + @IntDef(prefix = { "SAFE_BROWSING_THREAT_" }, value = { + SAFE_BROWSING_THREAT_UNKNOWN, + SAFE_BROWSING_THREAT_MALWARE, + SAFE_BROWSING_THREAT_PHISHING, + SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE }) @Retention(RetentionPolicy.SOURCE) public @interface SafeBrowsingThreat {} diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index dfb36423ea949..b2b93faf6656f 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -107,7 +107,10 @@ public class DatePicker extends FrameLayout { public static final int MODE_CALENDAR = 2; /** @hide */ - @IntDef({MODE_SPINNER, MODE_CALENDAR}) + @IntDef(prefix = { "MODE_" }, value = { + MODE_SPINNER, + MODE_CALENDAR + }) @Retention(RetentionPolicy.SOURCE) public @interface DatePickerMode {} diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index e065dc119880a..a4403984475f7 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -4924,7 +4924,10 @@ public class Editor { } @Retention(RetentionPolicy.SOURCE) - @IntDef({HANDLE_TYPE_SELECTION_START, HANDLE_TYPE_SELECTION_END}) + @IntDef(prefix = { "HANDLE_TYPE_" }, value = { + HANDLE_TYPE_SELECTION_START, + HANDLE_TYPE_SELECTION_END + }) public @interface HandleType {} public static final int HANDLE_TYPE_SELECTION_START = 0; public static final int HANDLE_TYPE_SELECTION_END = 1; @@ -6129,7 +6132,11 @@ public class Editor { } @Retention(RetentionPolicy.SOURCE) - @IntDef({MERGE_EDIT_MODE_FORCE_MERGE, MERGE_EDIT_MODE_NEVER_MERGE, MERGE_EDIT_MODE_NORMAL}) + @IntDef(prefix = { "MERGE_EDIT_MODE_" }, value = { + MERGE_EDIT_MODE_FORCE_MERGE, + MERGE_EDIT_MODE_NEVER_MERGE, + MERGE_EDIT_MODE_NORMAL + }) private @interface MergeMode {} private static final int MERGE_EDIT_MODE_FORCE_MERGE = 0; private static final int MERGE_EDIT_MODE_NEVER_MERGE = 1; diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java index cbd1e0ad09982..012b918ff34e9 100644 --- a/core/java/android/widget/GridLayout.java +++ b/core/java/android/widget/GridLayout.java @@ -172,7 +172,10 @@ public class GridLayout extends ViewGroup { // Public constants /** @hide */ - @IntDef({HORIZONTAL, VERTICAL}) + @IntDef(prefix = { "HORIZONTAL", "VERTICAL" }, value = { + HORIZONTAL, + VERTICAL + }) @Retention(RetentionPolicy.SOURCE) public @interface Orientation {} @@ -198,7 +201,10 @@ public class GridLayout extends ViewGroup { public static final int UNDEFINED = Integer.MIN_VALUE; /** @hide */ - @IntDef({ALIGN_BOUNDS, ALIGN_MARGINS}) + @IntDef(prefix = { "ALIGN_" }, value = { + ALIGN_BOUNDS, + ALIGN_MARGINS + }) @Retention(RetentionPolicy.SOURCE) public @interface AlignmentMode {} diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index fcb44af672d5a..1ec9b2f043b58 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -65,7 +65,12 @@ import java.lang.annotation.RetentionPolicy; @RemoteView public class GridView extends AbsListView { /** @hide */ - @IntDef({NO_STRETCH, STRETCH_SPACING, STRETCH_COLUMN_WIDTH, STRETCH_SPACING_UNIFORM}) + @IntDef(prefix = { "NO_STRETCH", "STRETCH_" }, value = { + NO_STRETCH, + STRETCH_SPACING, + STRETCH_COLUMN_WIDTH, + STRETCH_SPACING_UNIFORM + }) @Retention(RetentionPolicy.SOURCE) public @interface StretchMode {} diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 380bf7add2390..7ea1f1edadf53 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -95,13 +95,12 @@ public class LinearLayout extends ViewGroup { public static final int VERTICAL = 1; /** @hide */ - @IntDef(flag = true, - value = { - SHOW_DIVIDER_NONE, - SHOW_DIVIDER_BEGINNING, - SHOW_DIVIDER_MIDDLE, - SHOW_DIVIDER_END - }) + @IntDef(flag = true, prefix = { "SHOW_DIVIDER_" }, value = { + SHOW_DIVIDER_NONE, + SHOW_DIVIDER_BEGINNING, + SHOW_DIVIDER_MIDDLE, + SHOW_DIVIDER_END + }) @Retention(RetentionPolicy.SOURCE) public @interface DividerMode {} diff --git a/core/java/android/widget/NumberPicker.java b/core/java/android/widget/NumberPicker.java index 4d3189efa64e4..d98b865debc6e 100644 --- a/core/java/android/widget/NumberPicker.java +++ b/core/java/android/widget/NumberPicker.java @@ -510,7 +510,11 @@ public class NumberPicker extends LinearLayout { */ public interface OnScrollListener { /** @hide */ - @IntDef({SCROLL_STATE_IDLE, SCROLL_STATE_TOUCH_SCROLL, SCROLL_STATE_FLING}) + @IntDef(prefix = { "SCROLL_STATE_" }, value = { + SCROLL_STATE_IDLE, + SCROLL_STATE_TOUCH_SCROLL, + SCROLL_STATE_FLING + }) @Retention(RetentionPolicy.SOURCE) public @interface ScrollState {} diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index f8083babef29e..903d3cafcef84 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -751,7 +751,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public static final int AUTO_SIZE_TEXT_TYPE_UNIFORM = 1; /** @hide */ - @IntDef({AUTO_SIZE_TEXT_TYPE_NONE, AUTO_SIZE_TEXT_TYPE_UNIFORM}) + @IntDef(prefix = { "AUTO_SIZE_TEXT_TYPE_" }, value = { + AUTO_SIZE_TEXT_TYPE_NONE, + AUTO_SIZE_TEXT_TYPE_UNIFORM + }) @Retention(RetentionPolicy.SOURCE) public @interface AutoSizeTextType {} // Default minimum size for auto-sizing text in scaled pixels. diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java index ae6881e4e28cc..cfec3f2f603a2 100644 --- a/core/java/android/widget/TimePicker.java +++ b/core/java/android/widget/TimePicker.java @@ -77,7 +77,10 @@ public class TimePicker extends FrameLayout { public static final int MODE_CLOCK = 2; /** @hide */ - @IntDef({MODE_SPINNER, MODE_CLOCK}) + @IntDef(prefix = { "MODE_" }, value = { + MODE_SPINNER, + MODE_CLOCK + }) @Retention(RetentionPolicy.SOURCE) public @interface TimePickerMode {} diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java index d80712006a532..edcf209bdf818 100644 --- a/core/java/android/widget/Toast.java +++ b/core/java/android/widget/Toast.java @@ -71,7 +71,10 @@ public class Toast { static final boolean localLOGV = false; /** @hide */ - @IntDef({LENGTH_SHORT, LENGTH_LONG}) + @IntDef(prefix = { "LENGTH_" }, value = { + LENGTH_SHORT, + LENGTH_LONG + }) @Retention(RetentionPolicy.SOURCE) public @interface Duration {}