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

Commit 33d0507e authored by Andrey Kulikov's avatar Andrey Kulikov Committed by Android (Google) Code Review
Browse files

Merge "Fix IntDef's usages in the platform Transitions"

parents 41b094f7 275ca2a6

core/java/android/transition/Fade.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class Fade extends Visibility { 
     * @param fadingMode The behavior of this transition, a combination of

     * {@link #IN} and {@link #OUT}.

     */

    public Fade(int fadingMode) {

    public Fade(@VisibilityMode int fadingMode) {

        setMode(fadingMode);

    }

core/java/android/transition/Slide.java

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public class Slide extends Visibility { 
    /**

     * Constructor using the provided slide edge direction.

     */

    public Slide(int slideEdge) {

    public Slide(@GravityFlag int slideEdge) {

        setSlideEdge(slideEdge);

    }

core/java/android/transition/Visibility.java

+4 −2
Original line number Diff line number Diff line
@@ -52,9 +52,11 @@ public abstract class Visibility extends Transition { 


    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

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

    @IntDef(flag = true, value = {

            MODE_IN,

            MODE_OUT

            MODE_OUT,

            Fade.IN,

            Fade.OUT

    })

    @interface VisibilityMode {}