diff options
| author | 2017-09-12 12:29:46 +0000 | |
|---|---|---|
| committer | 2017-09-12 12:29:46 +0000 | |
| commit | d9ad8cbb0ca34ddefeb849cc10f36b53c4a29c51 (patch) | |
| tree | 6c342f45d33b826df94e7622e80ab84abf25f154 | |
| parent | ce30e909c2dbbf42eb5159d84252b224cc15d28b (diff) | |
| parent | b7202a8339652a721a285c37358e38b4926f8e25 (diff) | |
Merge "Fix light status bar when transitioning home -> recents" into oc-mr1-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index df0dfcb053a3..28dba73db263 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -1484,7 +1484,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP // TODO: Another visibility method that was added late in the release to minimize risk. @Override public boolean canAffectSystemUiFlags() { - final boolean shown = mWinAnimator.getShown() && mWinAnimator.mShownAlpha > 0f; + final boolean shown = mWinAnimator.getShown(); // We only consider the app to be exiting when the animation has started. After the app // transition is executed the windows are marked exiting before the new windows have been @@ -1498,7 +1498,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP final boolean exiting = exitingSelf || mDestroying || appExiting; final boolean translucent = mAttrs.alpha == 0.0f; - return shown && !exiting && !translucent; + + // If we are entering with a dummy animation, avoid affecting SystemUI flags until the + // transition is starting. + final boolean enteringWithDummyAnimation = + mWinAnimator.isDummyAnimation() && mWinAnimator.mShownAlpha == 0f; + return shown && !exiting && !translucent && !enteringWithDummyAnimation; } /** |