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

Commit 2cb79806 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am a6b8189f: am 9ce1ea3a: Merge "Fix starting window problems." into jb-dev 

* commit 'a6b8189f':
  Fix starting window problems.
parents ab37038d a6b8189f

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

+5 −2
Original line number Diff line number Diff line
@@ -4051,7 +4051,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                        // token.

                        wtoken.startingData = ttoken.startingData;

                        wtoken.startingView = ttoken.startingView;

                        wtoken.startingDisplayed = ttoken.startingDisplayed;

                        wtoken.startingWindow = startingWindow;

                        wtoken.reportedVisible = ttoken.reportedVisible;

                        ttoken.startingData = null;

                        ttoken.startingView = null;

                        ttoken.startingWindow = null;
@@ -4340,14 +4342,15 @@ public class WindowManagerService extends IWindowManager.Stub 


                if (DEBUG_APP_TRANSITIONS) Slog.v(

                        TAG, "Setting dummy animation on: " + wtoken);

                if (!wtoken.startingDisplayed) {

                    wtoken.mAppAnimator.setDummyAnimation();

                }

                mOpeningApps.remove(wtoken);

                mClosingApps.remove(wtoken);

                wtoken.waitingToShow = wtoken.waitingToHide = false;

                wtoken.inPendingTransaction = true;

                if (visible) {

                    mOpeningApps.add(wtoken);

                    wtoken.startingDisplayed = false;

                    wtoken.startingMoved = false;



                    // If the token is currently hidden (should be the

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

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
    }



    public boolean hasAppShownWindows() {

        return mAppToken != null ? mAppToken.firstWindowDrawn : false;

        return mAppToken != null && (mAppToken.firstWindowDrawn || mAppToken.startingDisplayed);

    }



    boolean isIdentityMatrix(float dsdx, float dtdx, float dsdy, float dtdy) {

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

+7 −3
Original line number Diff line number Diff line
@@ -896,10 +896,14 @@ class WindowStateAnimator { 
                //Slog.i(TAG, "Not applying alpha transform");

            }



            if (WindowManagerService.localLOGV) Slog.v(

            if (WindowManagerService.localLOGV && (mShownAlpha == 1.0 || mShownAlpha == 0.0)) Slog.v(

                TAG, "computeShownFrameLocked: Animating " + this +

                ": " + mWin.mShownFrame +

                ", alpha=" + mTransformation.getAlpha() + ", mShownAlpha=" + mShownAlpha);

                " mAlpha=" + mAlpha +

                " self=" + (selfTransformation ? mTransformation.getAlpha() : "null") +

                " attached=" + (attachedTransformation == null ? "null" : attachedTransformation.getAlpha()) +

                " app=" + (appTransformation == null ? "null" : appTransformation.getAlpha()) +

                " screen=" + (screenAnimation ? mService.mAnimator.mScreenRotationAnimation.getEnterTransformation().getAlpha()

                        : "null"));

            return;

        } else if (mWin.mIsWallpaper &&

                    (mAnimator.mPendingActions & WindowAnimator.WALLPAPER_ACTION_PENDING) != 0) {