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

Commit 3c174370 authored by Craig Mautner's avatar Craig Mautner
Browse files

Create rotation animation modes. 

Allow fullscreen windows to specify crossfade or jumpcut animations
that override the default rotation animation. Only if the incoming
and outgoing topmost windows are fullscreen and both specify the
same animation to use.

Fixes bug 8182773.

Change-Id: I6b3c0020d7bd2cdfba5c66189e114ec62cd54fcf
parent 7a7360ad

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -26289,6 +26289,10 @@ package android.view { 
    field public static final deprecated int MEMORY_TYPE_HARDWARE = 1; // 0x1

    field public static final deprecated int MEMORY_TYPE_NORMAL = 0; // 0x0

    field public static final deprecated int MEMORY_TYPE_PUSH_BUFFERS = 3; // 0x3

    field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000

    field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1

    field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2

    field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0

    field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800

    field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400

    field public static final int SOFT_INPUT_ADJUST_NOTHING = 48; // 0x30
@@ -26339,6 +26343,7 @@ package android.view { 
    field public float horizontalWeight;

    field public deprecated int memoryType;

    field public java.lang.String packageName;

    field public int rotationAnimation;

    field public float screenBrightness;

    field public int screenOrientation;

    field public int softInputMode;

core/java/android/view/WindowManager.java

+48 −6
Original line number Diff line number Diff line
@@ -1192,6 +1192,37 @@ public interface WindowManager extends ViewManager { 
         */

        public float buttonBrightness = BRIGHTNESS_OVERRIDE_NONE;



        /**

         * Value for {@link #rotationAnimation} to define the animation used to

         * specify that this window will rotate in or out following a rotation.

         */

        public static final int ROTATION_ANIMATION_ROTATE = 0;



        /**

         * Value for {@link #rotationAnimation} to define the animation used to

         * specify that this window will fade in or out following a rotation.

         */

        public static final int ROTATION_ANIMATION_CROSSFADE = 1;



        /**

         * Value for {@link #rotationAnimation} to define the animation used to

         * specify that this window will immediately disappear or appear following

         * a rotation.

         */

        public static final int ROTATION_ANIMATION_JUMPCUT = 2;



        /**

         * Define the animation used on this window for entry or exit following

         * a rotation. This only works if the incoming and outgoing topmost

         * opaque windows have the #FLAG_FULLSCREEN bit set and are not covered

         * by other windows.

         * 

         * @see #ROTATION_ANIMATION_ROTATE

         * @see #ROTATION_ANIMATION_CROSSFADE

         * @see #ROTATION_ANIMATION_JUMPCUT

         */

        public int rotationAnimation = ROTATION_ANIMATION_ROTATE;



        /**

         * Identifier for this window.  This will usually be filled in for

         * you.
@@ -1367,6 +1398,7 @@ public interface WindowManager extends ViewManager { 
            out.writeFloat(dimAmount);

            out.writeFloat(screenBrightness);

            out.writeFloat(buttonBrightness);

            out.writeInt(rotationAnimation);

            out.writeStrongBinder(token);

            out.writeString(packageName);

            TextUtils.writeToParcel(mTitle, out, parcelableFlags);
@@ -1408,6 +1440,7 @@ public interface WindowManager extends ViewManager { 
            dimAmount = in.readFloat();

            screenBrightness = in.readFloat();

            buttonBrightness = in.readFloat();

            rotationAnimation = in.readInt();

            token = in.readStrongBinder();

            packageName = in.readString();

            mTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
@@ -1432,18 +1465,19 @@ public interface WindowManager extends ViewManager { 
        public static final int SOFT_INPUT_MODE_CHANGED = 1<<9;

        public static final int SCREEN_ORIENTATION_CHANGED = 1<<10;

        public static final int SCREEN_BRIGHTNESS_CHANGED = 1<<11;

        public static final int ROTATION_ANIMATION_CHANGED = 1<<12;

        /** {@hide} */

        public static final int BUTTON_BRIGHTNESS_CHANGED = 1<<12;

        public static final int BUTTON_BRIGHTNESS_CHANGED = 1<<13;

        /** {@hide} */

        public static final int SYSTEM_UI_VISIBILITY_CHANGED = 1<<13;

        public static final int SYSTEM_UI_VISIBILITY_CHANGED = 1<<14;

        /** {@hide} */

        public static final int SYSTEM_UI_LISTENER_CHANGED = 1<<14;

        public static final int SYSTEM_UI_LISTENER_CHANGED = 1<<15;

        /** {@hide} */

        public static final int INPUT_FEATURES_CHANGED = 1<<15;

        public static final int INPUT_FEATURES_CHANGED = 1<<16;

        /** {@hide} */

        public static final int PRIVATE_FLAGS_CHANGED = 1<<16;

        public static final int PRIVATE_FLAGS_CHANGED = 1<<17;

        /** {@hide} */

        public static final int USER_ACTIVITY_TIMEOUT_CHANGED = 1<<17;

        public static final int USER_ACTIVITY_TIMEOUT_CHANGED = 1<<18;

        /** {@hide} */

        public static final int EVERYTHING_CHANGED = 0xffffffff;
@@ -1543,6 +1577,10 @@ public interface WindowManager extends ViewManager { 
                buttonBrightness = o.buttonBrightness;

                changes |= BUTTON_BRIGHTNESS_CHANGED;

            }

            if (rotationAnimation != o.rotationAnimation) {

                rotationAnimation = o.rotationAnimation;

                changes |= ROTATION_ANIMATION_CHANGED;

            }

    

            if (screenOrientation != o.screenOrientation) {

                screenOrientation = o.screenOrientation;
@@ -1645,6 +1683,10 @@ public interface WindowManager extends ViewManager { 
                sb.append(" bbrt=");

                sb.append(buttonBrightness);

            }

            if (rotationAnimation != ROTATION_ANIMATION_ROTATE) {

                sb.append(" rotAnim=");

                sb.append(rotationAnimation);

            }

            if ((flags & FLAG_COMPATIBLE_WINDOW) != 0) {

                sb.append(" compatible=true");

            }

core/java/android/view/WindowManagerPolicy.java

+27 −0
Original line number Diff line number Diff line
@@ -683,6 +683,31 @@ public interface WindowManagerPolicy { 
     */

    public int selectAnimationLw(WindowState win, int transit);



    /**

     * Determine the animation to run for a rotation transition based on the

     * top fullscreen windows {@link WindowManager.LayoutParams#rotationAnimation}

     * and whether it is currently fullscreen and frontmost.

     * 

     * @param anim The exiting animation resource id is stored in anim[0], the 

     * entering animation resource id is stored in anim[1].

     */

    public void selectRotationAnimationLw(int anim[]);



    /**

     * Validate whether the current top fullscreen has specified the same

     * {@link WindowManager.LayoutParams#rotationAnimation} value as that

     * being passed in from the previous top fullscreen window.

     *

     * @param exitAnimId exiting resource id from the previous window.

     * @param enterAnimId entering resource id from the previous window.

     * @param forceDefault For rotation animations only, if true ignore the

     * animation values and just return false.

     * @return true if the previous values are still valid, false if they

     * should be replaced with the default.

     */

    public boolean validateRotationAnimationLw(int exitAnimId, int enterAnimId,

            boolean forceDefault);



    /**

     * Create and return an animation to re-display a force hidden window.

     */
@@ -909,6 +934,7 @@ public interface WindowManagerPolicy { 
     * @see android.app.KeyguardManager.KeyguardLock#disableKeyguard()

     * @see android.app.KeyguardManager.KeyguardLock#reenableKeyguard()

     */

    @SuppressWarnings("javadoc")

    public void enableKeyguard(boolean enabled);



    /**
@@ -924,6 +950,7 @@ public interface WindowManagerPolicy { 
     * @param callback Callback to send the result back.

     * @see android.app.KeyguardManager#exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult)

     */

    @SuppressWarnings("javadoc")

    void exitKeyguardSecurely(OnKeyguardExitResult callback);



    /**

core/res/res/anim/rotation_animation_enter.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android">

    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"

            android:duration="0"

            android:interpolator="@interpolator/decelerate_quad" />

</set>

core/res/res/anim/rotation_animation_jump_exit.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<set xmlns:android="http://schemas.android.com/apk/res/android">

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

            android:duration="0"

            android:interpolator="@interpolator/decelerate_quad" />

</set>