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

Commit 248b1888 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix #1827299: Google login screen to re-enter password is not viewable 

This was a problem with not hiding the starting window when it got
transfered to an activity whose window (instead of token) animates
when displayed.

Change-Id: I9eb58faa6e27d53144687952a715fc083a5c5842
parent 32c687c2

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

+12 −2
Original line number Diff line number Diff line
@@ -7056,7 +7056,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        + " attHidden=" + mAttachedHidden

                        + " tok.hiddenRequested="

                        + (mAppToken != null ? mAppToken.hiddenRequested : false)

                        + " tok.idden="

                        + " tok.hidden="

                        + (mAppToken != null ? mAppToken.hidden : false)

                        + " animating=" + mAnimating

                        + " tok animating="
@@ -7085,10 +7085,20 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (mAttrs.type != TYPE_APPLICATION_STARTING

                        && mAppToken != null) {

                    mAppToken.firstWindowDrawn = true;

                    if (mAnimation == null && mAppToken.startingData != null) {

                    

                    if (mAppToken.startingData != null) {

                        if (DEBUG_STARTING_WINDOW) Log.v(TAG, "Finish starting "

                                + mToken

                                + ": first real window is shown, no animation");

                        // If this initial window is animating, stop it -- we

                        // will do an animation to reveal it from behind the

                        // starting window, so there is no need for it to also

                        // be doing its own stuff.

                        if (mAnimation != null) {

                            mAnimation = null;

                            // Make sure we clean up the animation.

                            mAnimating = true;

                        }

                        mFinishedStarting.add(mAppToken);

                        mH.sendEmptyMessage(H.FINISHED_STARTING);

                    }