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

Commit cee80981 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

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

parents f80ec158 427ba4ff

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.