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

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

Merge changes I2ef68697,I77811818,Ifba8b7d9 

* changes:
  WindowStateAnimator: Finish removing rotation animation path
  WSA: Remove dead inset adjustment code.
  WindowStateAnimator: Remove redundant Alpha operation.
parents 3141524b 16e6f529

services/core/java/com/android/server/wm/ScreenRotationAnimation.java

+0 −7
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ class ScreenRotationAnimation { 
    private final Transformation mRotateExitTransformation = new Transformation();

    private final Transformation mRotateEnterTransformation = new Transformation();

    // Complete transformations being applied.

    private final Transformation mEnterTransformation = new Transformation();

    private final Matrix mSnapshotInitialMatrix = new Matrix();

    private final WindowManagerService mService;

    /** Only used for custom animations and not screen rotation. */
@@ -309,8 +308,6 @@ class ScreenRotationAnimation { 
        pw.print(" "); mRotateExitTransformation.printShortString(pw); pw.println();

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

        pw.print(" "); mRotateEnterTransformation.printShortString(pw); pw.println();

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

        mEnterTransformation.printShortString(pw); pw.println();

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

        mSnapshotInitialMatrix.dump(pw); pw.println();

        pw.print(prefix); pw.print("mForceDefaultOrientation="); pw.print(mForceDefaultOrientation);
@@ -508,10 +505,6 @@ class ScreenRotationAnimation { 
        return mCurRotation != mOriginalRotation;

    }



    public Transformation getEnterTransformation() {

        return mEnterTransformation;

    }



    /**

     * Utility class that runs a {@link ScreenRotationAnimation} on the {@link

     * SurfaceAnimationRunner}.

services/core/java/com/android/server/wm/WindowStateAnimator.java

+1 −74
Original line number Diff line number Diff line
@@ -660,80 +660,7 @@ class WindowStateAnimator { 
    }



    void computeShownFrameLocked() {

        final ScreenRotationAnimation screenRotationAnimation =

                mWin.getDisplayContent().getRotationAnimation();

        final boolean windowParticipatesInScreenRotationAnimation =

                !mWin.mForceSeamlesslyRotate;

        final boolean screenAnimation = screenRotationAnimation != null

                && screenRotationAnimation.isAnimating()

                && windowParticipatesInScreenRotationAnimation;



        if (screenAnimation) {

            // cache often used attributes locally

            final Rect frame = mWin.getFrameLw();

            final float tmpFloats[] = mService.mTmpFloats;

            final Matrix tmpMatrix = mWin.mTmpMatrix;



            // Compute the desired transformation.

            if (screenRotationAnimation.isRotating()) {

                // If we are doing a screen animation, the global rotation

                // applied to windows can result in windows that are carefully

                // aligned with each other to slightly separate, allowing you

                // to see what is behind them.  An unsightly mess.  This...

                // thing...  magically makes it call good: scale each window

                // slightly (two pixels larger in each dimension, from the

                // window's center).

                final float w = frame.width();

                final float h = frame.height();

                if (w>=1 && h>=1) {

                    tmpMatrix.setScale(1 + 2/w, 1 + 2/h, w/2, h/2);

                } else {

                    tmpMatrix.reset();

                }

            } else {

                tmpMatrix.reset();

            }



            tmpMatrix.postScale(mWin.mGlobalScale, mWin.mGlobalScale);



            // WindowState.prepareSurfaces expands for surface insets (in order they don't get

            // clipped by the WindowState surface), so we need to go into the other direction here.

            tmpMatrix.postTranslate(mWin.mAttrs.surfaceInsets.left,

                    mWin.mAttrs.surfaceInsets.top);





            // "convert" it into SurfaceFlinger's format

            // (a 2x2 matrix + an offset)

            // Here we must not transform the position of the surface

            // since it is already included in the transformation.

            //Slog.i(TAG_WM, "Transform: " + matrix);



            mHaveMatrix = true;

            tmpMatrix.getValues(tmpFloats);

            mDsDx = tmpFloats[Matrix.MSCALE_X];

            mDtDx = tmpFloats[Matrix.MSKEW_Y];

            mDtDy = tmpFloats[Matrix.MSKEW_X];

            mDsDy = tmpFloats[Matrix.MSCALE_Y];



            // Now set the alpha...  but because our current hardware

            // can't do alpha transformation on a non-opaque surface,

            // turn it off if we are running an animation that is also

            // transforming since it is more important to have that

            // animation be smooth.

            mShownAlpha = mAlpha;

            if (!mService.mLimitedAlphaCompositing

                    || (!PixelFormat.formatHasAlpha(mWin.mAttrs.format)

                    || (mWin.isIdentityMatrix(mDsDx, mDtDx, mDtDy, mDsDy)))) {

                mShownAlpha *= screenRotationAnimation.getEnterTransformation().getAlpha();

            }



            if ((DEBUG_ANIM || DEBUG) && (mShownAlpha == 1.0 || mShownAlpha == 0.0)) {

                Slog.v(TAG, "computeShownFrameLocked: Animating " + this + " mAlpha=" + mAlpha

                                + " screen=" + (screenAnimation

                        ? screenRotationAnimation.getEnterTransformation().getAlpha() : "null"));

            }

            return;

        } else if (mIsWallpaper && mService.mRoot.mWallpaperActionPending) {

        if (mIsWallpaper && mService.mRoot.mWallpaperActionPending) {

            return;

        } else if (mWin.isDragResizeChanged()) {

            // This window is awaiting a relayout because user just started (or ended)