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

Commit 81defc79 authored by Craig Mautner's avatar Craig Mautner
Browse files

Force relayout at completion of status bar animation 

A final layout pass should be done whenever the status bar has
completed its incoming animation.

Fixes bug 10387660.

Change-Id: I48c19015c53116b58cf73e20be32d1f64dd682ca
parent 66b753b0

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+9 −1
Original line number Diff line number Diff line
@@ -3466,6 +3466,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                if (mStatusBarController.setBarShowingLw(true)) {

                    changes |= FINISH_LAYOUT_REDO_LAYOUT;

                }

                // Maintain fullscreen layout until incoming animation is complete.

                topIsFullscreen = mTopIsFullscreen && mStatusBar.isAnimatingLw();

            } else if (mTopFullscreenOpaqueWindowState != null) {

                if (localLOGV) {

                    Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw()
@@ -3499,7 +3501,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

        }



        if (mTopIsFullscreen != topIsFullscreen) {

            if (!topIsFullscreen) {

                // Force another layout when status bar becomes fully shown.

                changes |= FINISH_LAYOUT_REDO_LAYOUT;

            }

            mTopIsFullscreen = topIsFullscreen;

        }



        // Hide the key guard if a visible window explicitly specifies that it wants to be

        // displayed when the screen is locked.

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

+4 −0
Original line number Diff line number Diff line
@@ -360,6 +360,10 @@ class WindowStateAnimator { 
                    + mWin.mToken + ": first real window done animating");

            mService.mFinishedStarting.add(mWin.mAppToken);

            mService.mH.sendEmptyMessage(H.FINISHED_STARTING);

        } else if (mAttrType == LayoutParams.TYPE_STATUS_BAR && mWin.mPolicyVisibility) {

            // Upon completion of a not-visible to visible status bar animation a relayout is

            // required.

            mWin.mDisplayContent.layoutNeeded = true;

        }



        finishExit();