Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d720dedb: Merge "Clear the previous states before setting the new app visibility"

Browse Source 
* commit 'd720dedb03dfc937361e7e722171f8a1b9d74cf1':
  Clear the previous states before setting the new app visibility
This commit is contained in:
Craig Mautner
2015-04-01 01:27:34 +00:00
committed by Android Git Automerger
parent 5db6f1fafa d720dedb03
commit 8bed4843dc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -4644,19 +4644,19 @@ public class WindowManagerService extends IWindowManager.Stub
wtoken.hiddenRequested, HIDE_STACK_CRAWLS ? wtoken.hiddenRequested, HIDE_STACK_CRAWLS ?
null : new RuntimeException("here").fillInStackTrace()); null : new RuntimeException("here").fillInStackTrace());
mOpeningApps.remove(wtoken);
mClosingApps.remove(wtoken);
wtoken.waitingToShow = wtoken.waitingToHide = false;
wtoken.hiddenRequested = !visible;
// If we are preparing an app transition, then delay changing // If we are preparing an app transition, then delay changing
// the visibility of this token until we execute that transition. // the visibility of this token until we execute that transition.
if (okToDisplay() && mAppTransition.isTransitionSet()) { if (okToDisplay() && mAppTransition.isTransitionSet()) {
wtoken.hiddenRequested = !visible;
if (!wtoken.startingDisplayed) { if (!wtoken.startingDisplayed) {
if (DEBUG_APP_TRANSITIONS) Slog.v( if (DEBUG_APP_TRANSITIONS) Slog.v(
TAG, "Setting dummy animation on: " + wtoken); TAG, "Setting dummy animation on: " + wtoken);
wtoken.mAppAnimator.setDummyAnimation(); wtoken.mAppAnimator.setDummyAnimation();
} }
mOpeningApps.remove(wtoken);
mClosingApps.remove(wtoken);
wtoken.waitingToShow = wtoken.waitingToHide = false;
wtoken.inPendingTransaction = true; wtoken.inPendingTransaction = true;
if (visible) { if (visible) {
mOpeningApps.add(wtoken); mOpeningApps.add(wtoken);