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

Commit 427ba4ff authored by Robert Carr's avatar Robert Carr
Browse files

Fix rotation animation selection. 

The default manifest value needs to be unspecified, not rotate,
as rotate overrides the LayoutParams specified value.

Bug: 63151981
Test: Manual from bug. go/wm-smoke.
Change-Id: I2ad6e3fdd06eeef0166bbe09d07b57cc45ed6e50
parent f99ac67b

core/java/android/content/pm/PackageParser.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NO_CERTIFIC 
import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION;

import static android.os.Build.VERSION_CODES.O;

import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER;

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_ROTATE;

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_UNSPECIFIED;



import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -4283,7 +4283,7 @@ public class PackageParser { 
                sa.getString(R.styleable.AndroidManifestActivity_enableVrMode);



            a.info.rotationAnimation =

                sa.getInt(R.styleable.AndroidManifestActivity_rotationAnimation, ROTATION_ANIMATION_ROTATE);

                sa.getInt(R.styleable.AndroidManifestActivity_rotationAnimation, ROTATION_ANIMATION_UNSPECIFIED);



            a.info.colorMode = sa.getInt(R.styleable.AndroidManifestActivity_colorMode,

                    ActivityInfo.COLOR_MODE_DEFAULT);

core/java/android/view/WindowManager.java

+7 −0
Original line number Diff line number Diff line
@@ -1742,6 +1742,13 @@ public interface WindowManager extends ViewManager { 
         */

        public float buttonBrightness = BRIGHTNESS_OVERRIDE_NONE;



        /**

         * Unspecified value for {@link #rotationAnimation} indicating

         * a lack of preference.

         * @hide

         */

        public static final int ROTATION_ANIMATION_UNSPECIFIED = -1;



        /**

         * Value for {@link #rotationAnimation} which specifies that this

         * window will visually rotate in or out following a rotation.