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

Commit 895d7310 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add more IntDef prefixes for auto-documenting."

parents c9f1a9e3 ce8db991

core/java/android/accessibilityservice/AccessibilityService.java

+6 −2
Original line number Diff line number Diff line
@@ -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;

core/java/android/accounts/AccountManager.java

+7 −2
Original line number Diff line number Diff line
@@ -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 {

    }

core/java/android/app/ActionBar.java

+13 −10
Original line number Diff line number Diff line
@@ -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,8 +143,7 @@ public abstract class ActionBar { 


    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(flag = true,

            value = {

    @IntDef(flag = true, prefix = { "DISPLAY_" }, value = {

            DISPLAY_USE_LOGO,

            DISPLAY_SHOW_HOME,

            DISPLAY_HOME_AS_UP,

core/java/android/app/ActivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/java/android/app/FragmentTransaction.java

+6 −1
Original line number Diff line number Diff line
@@ -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 {}