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

Commit 0a2b84d6 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "Fix rotation animation selection." into oc-dev 

am: e8d7c01e

Change-Id: Ife07062b479b5cffc6e56a8d46d545c22caf8198
parents 68eecb37 e8d7c01e

core/java/android/content/pm/ActivityInfo.java

+4 −1
Original line number Diff line number Diff line
@@ -883,9 +883,12 @@ public class ActivityInfo extends ComponentInfo 
    /**

     * Screen rotation animation desired by the activity, with values as defined

     * for {@link android.view.WindowManager.LayoutParams#rotationAnimation}.

     *

     * -1 means to use the system default.

     *

     * @hide

     */

    public int rotationAnimation = ROTATION_ANIMATION_ROTATE;

    public int rotationAnimation = -1;



    /** @hide */

    public static final int LOCK_TASK_LAUNCH_MODE_DEFAULT = 0;