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

Commit a57c695b authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Reduce duration of rotation xfade animation. 

Also add code for tracking how long a rotation takes,
and who is causing it to take that time.

Change-Id: Ie3352ddfddd247f5a5c08f7da6bfe6b4da607ba2
parent cb5a4bf2

core/res/res/anim/rotation_animation_xfade_exit.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 


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

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

            android:duration="500"

            android:duration="150"

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

</set>

services/java/com/android/server/wm/AppWindowAnimator.java

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ package com.android.server.wm; 


import android.graphics.Matrix;

import android.util.Slog;

import android.util.TimeUtils;

import android.view.Display;

import android.view.Surface;

import android.view.SurfaceControl;
@@ -30,6 +31,11 @@ public class AppWindowAnimator { 
    // Protect with mAnimator.

    boolean freezingScreen;



    /**

     * How long we last kept the screen frozen.

     */

    int lastFreezeDuration;



    // Offset to the window of all layers in the token, for use by

    // AppWindowToken animations.

    int animLayerAdjustment;
@@ -287,6 +293,10 @@ public class AppWindowAnimator { 
        pw.print(prefix); pw.print("freezingScreen="); pw.print(freezingScreen);

                pw.print(" allDrawn="); pw.print(allDrawn);

                pw.print(" animLayerAdjustment="); pw.println(animLayerAdjustment);

        if (lastFreezeDuration != 0) {

            pw.print(prefix); pw.print("lastFreezeDuration=");

                    TimeUtils.formatDuration(lastFreezeDuration, pw); pw.println();

        }

        if (animating || animation != null) {

            pw.print(prefix); pw.print("animating="); pw.println(animating);

            pw.print(prefix); pw.print("animation="); pw.println(animation);

services/java/com/android/server/wm/WindowAnimator.java

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class WindowAnimator { 
    int mAboveUniverseLayer = 0;



    int mBulkUpdateParams = 0;

    Object mLastWindowFreezeSource;



    SparseArray<DisplayContentsAnimator> mDisplayContentsAnimators =

            new SparseArray<WindowAnimator.DisplayContentsAnimator>();

services/java/com/android/server/wm/WindowManagerService.java

+45 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; 
import static android.view.WindowManagerPolicy.FINISH_LAYOUT_REDO_WALLPAPER;



import android.app.AppOpsManager;

import android.util.TimeUtils;

import android.view.IWindowId;

import com.android.internal.app.IBatteryStats;

import com.android.internal.policy.PolicyManager;
@@ -464,6 +465,9 @@ public class WindowManagerService extends IWindowManager.Stub 


    boolean mTraversalScheduled = false;

    boolean mDisplayFrozen = false;

    long mDisplayFreezeTime = 0;

    int mLastDisplayFreezeDuration = 0;

    Object mLastFinishedFreezeSource = null;

    boolean mWaitingForConfig = false;

    boolean mWindowsFreezingScreen = false;

    boolean mClientFreezingScreen = false;
@@ -582,6 +586,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        boolean mWallpaperForceHidingChanged = false;

        boolean mWallpaperMayChange = false;

        boolean mOrientationChangeComplete = true;

        Object mLastWindowFreezeSource = null;

        private Session mHoldScreen = null;

        private boolean mObscured = false;

        boolean mDimming = false;
@@ -3590,7 +3595,10 @@ public class WindowManagerService extends IWindowManager.Stub 


        synchronized(mWindowMap) {

            mCurConfiguration = new Configuration(config);

            if (mWaitingForConfig) {

                mWaitingForConfig = false;

                mLastFinishedFreezeSource = "new-config";

            }

            performLayoutAndPlaceSurfacesLocked();

        }

    }
@@ -4209,6 +4217,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        w.mOrientationChanging = true;

                        mInnerFields.mOrientationChangeComplete = false;

                    }

                    w.mLastFreezeDuration = 0;

                    unfrozeWindows = true;

                    w.mDisplayContent.layoutNeeded = true;

                }
@@ -4216,7 +4225,10 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (force || unfrozeWindows) {

                if (DEBUG_ORIENTATION) Slog.v(TAG, "No longer freezing: " + wtoken);

                wtoken.mAppAnimator.freezingScreen = false;

                wtoken.mAppAnimator.lastFreezeDuration = (int)(SystemClock.elapsedRealtime()

                        - mDisplayFreezeTime);

                mAppsFreezingScreen--;

                mLastFinishedFreezeSource = wtoken;

            }

            if (unfreezeSurfaceNow) {

                if (unfrozeWindows) {
@@ -4242,6 +4254,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (!wtoken.hiddenRequested) {

            if (!wtoken.mAppAnimator.freezingScreen) {

                wtoken.mAppAnimator.freezingScreen = true;

                wtoken.mAppAnimator.lastFreezeDuration = 0;

                mAppsFreezingScreen++;

                if (mAppsFreezingScreen == 1) {

                    startFreezingDisplayLocked(false, 0, 0);
@@ -4750,6 +4763,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        synchronized(mWindowMap) {

            if (mClientFreezingScreen) {

                mClientFreezingScreen = false;

                mLastFinishedFreezeSource = "client";

                final long origId = Binder.clearCallingIdentity();

                try {

                    stopFreezingDisplayLocked();
@@ -5743,6 +5757,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                w.mOrientationChanging = true;

                mInnerFields.mOrientationChangeComplete = false;

            }

            w.mLastFreezeDuration = 0;

        }



        for (int i=mRotationWatchers.size()-1; i>=0; i--) {
@@ -6228,6 +6243,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (config == null && mWaitingForConfig) {

                // Nothing changed but we are waiting for something... stop that!

                mWaitingForConfig = false;

                mLastFinishedFreezeSource = "new-config";

                performLayoutAndPlaceSurfacesLocked();

            }

            return config;
@@ -7024,6 +7040,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                            WindowState w = windows.get(i);

                            if (w.mOrientationChanging) {

                                w.mOrientationChanging = false;

                                w.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime()

                                        - mDisplayFreezeTime);

                                Slog.w(TAG, "Force clearing orientation change: " + w);

                            }

                        }
@@ -7100,6 +7118,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    synchronized (mWindowMap) {

                        if (mClientFreezingScreen) {

                            mClientFreezingScreen = false;

                            mLastFinishedFreezeSource = "client-timeout";

                            stopFreezingDisplayLocked();

                        }

                    }
@@ -8017,6 +8036,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (DEBUG_ORIENTATION) Slog.v(TAG,

                    "Changing surface while display frozen: " + w);

            w.mOrientationChanging = true;

            w.mLastFreezeDuration = 0;

            mInnerFields.mOrientationChangeComplete = false;

            if (!mWindowsFreezingScreen) {

                mWindowsFreezingScreen = true;
@@ -8405,6 +8425,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                            "Orientation not waiting for draw in "

                            + w + ", surface " + winAnimator.mSurfaceControl);

                    w.mOrientationChanging = false;

                    w.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime()

                            - mDisplayFreezeTime);

                }

            }

        }
@@ -8918,6 +8940,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                winAnimator.mSurfaceResized = false;

            } catch (RemoteException e) {

                win.mOrientationChanging = false;

                win.mLastFreezeDuration = (int)(SystemClock.elapsedRealtime()

                        - mDisplayFreezeTime);

            }

            mResizingWindows.remove(i);

        }
@@ -8928,6 +8952,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (mInnerFields.mOrientationChangeComplete) {

            if (mWindowsFreezingScreen) {

                mWindowsFreezingScreen = false;

                mLastFinishedFreezeSource = mInnerFields.mLastWindowFreezeSource;

                mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);

            }

            stopFreezingDisplayLocked();
@@ -9214,6 +9239,7 @@ public class WindowManagerService extends IWindowManager.Stub 
            mInnerFields.mOrientationChangeComplete = false;

        } else {

            mInnerFields.mOrientationChangeComplete = true;

            mInnerFields.mLastWindowFreezeSource = mAnimator.mLastWindowFreezeSource;

            if (mWindowsFreezingScreen) {

                doRequest = true;

            }
@@ -9486,6 +9512,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        mScreenFrozenLock.acquire();



        mDisplayFrozen = true;

        mDisplayFreezeTime = SystemClock.elapsedRealtime();

        mLastFinishedFreezeSource = null;



        mInputMonitor.freezeInputDispatchingLw();
@@ -9540,6 +9568,15 @@ public class WindowManagerService extends IWindowManager.Stub 
        }



        mDisplayFrozen = false;

        mLastDisplayFreezeDuration = (int)(SystemClock.elapsedRealtime() - mDisplayFreezeTime);

        StringBuilder sb = new StringBuilder(128);

        sb.append("Screen frozen for ");

        TimeUtils.formatDuration(mLastDisplayFreezeDuration, sb);

        if (mLastFinishedFreezeSource != null) {

            sb.append(" due to ");

            sb.append(mLastFinishedFreezeSource);

        }

        Slog.i(TAG, sb.toString());

        mH.removeMessages(H.APP_FREEZE_TIMEOUT);

        mH.removeMessages(H.CLIENT_FREEZE_TIMEOUT);

        if (PROFILE_ORIENTATION) {
@@ -10064,6 +10101,13 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

        pw.print("  mInTouchMode="); pw.print(mInTouchMode);

                pw.print(" mLayoutSeq="); pw.println(mLayoutSeq);

        pw.print("  mLastDisplayFreezeDuration=");

                TimeUtils.formatDuration(mLastDisplayFreezeDuration, pw);

                if ( mLastFinishedFreezeSource != null) {

                    pw.print(" due to ");

                    pw.print(mLastFinishedFreezeSource);

                }

                pw.println();

        if (dumpAll) {

            pw.print("  mSystemDecorRect="); pw.print(mSystemDecorRect.toShortString());

                    pw.print(" mSystemDecorLayer="); pw.print(mSystemDecorLayer);

services/java/com/android/server/wm/WindowState.java

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; 


import android.app.AppOpsManager;

import android.os.RemoteCallbackList;

import android.util.TimeUtils;

import android.view.IWindowFocusObserver;

import android.view.IWindowId;

import com.android.server.input.InputWindowHandle;
@@ -266,6 +267,11 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
     */

    boolean mOrientationChanging;



    /**

     * How long we last kept the screen frozen.

     */

    int mLastFreezeDuration;



    /** Is this window now (or just being) removed? */

    boolean mRemoved;
@@ -1387,6 +1393,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                    pw.print(" mAppFreezing="); pw.print(mAppFreezing);

                    pw.print(" mTurnOnScreen="); pw.println(mTurnOnScreen);

        }

        if (mLastFreezeDuration != 0) {

            pw.print(prefix); pw.print("mLastFreezeDuration=");

                    TimeUtils.formatDuration(mLastFreezeDuration, pw); pw.println();

        }

        if (mHScale != 1 || mVScale != 1) {

            pw.print(prefix); pw.print("mHScale="); pw.print(mHScale);

                    pw.print(" mVScale="); pw.println(mVScale);