diff options
author | Craig Mautner <cmautner@google.com> | 2013-10-30 07:06:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-30 07:06:04 -0700 |
commit | ff060d860564129243cd9a8931e70da29a4703d8 (patch) | |
tree | d3febb0db27530dacd683701e7b68c5d9b402047 /policy | |
parent | c336c29cdfb6f392031e700db6ad6e167e78ffed (diff) | |
parent | e2f7463867d5e30a7e03c800fd907136b3152d1c (diff) | |
download | frameworks_base-ff060d860564129243cd9a8931e70da29a4703d8.zip frameworks_base-ff060d860564129243cd9a8931e70da29a4703d8.tar.gz frameworks_base-ff060d860564129243cd9a8931e70da29a4703d8.tar.bz2 |
am e2f74638: am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar animation" into klp-dev
* commit 'e2f7463867d5e30a7e03c800fd907136b3152d1c':
Force relayout at completion of status bar animation
Diffstat (limited to 'policy')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 020c1fd..d653920 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3471,6 +3471,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() @@ -3504,7 +3506,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } - mTopIsFullscreen = topIsFullscreen; + 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. |