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

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

Browse Source 
* commit '8bed4843dc7f93a30e607dbb11012a04ca5dcf95':
  Clear the previous states before setting the new app visibility
This commit is contained in:
Craig Mautner
2015-04-01 02:05:33 +00:00
committed by Android Git Automerger
parent 02dff422a7 8bed4843dc
commit a54f2b164a
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 ?
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
// the visibility of this token until we execute that transition.
if (okToDisplay() && mAppTransition.isTransitionSet()) {
wtoken.hiddenRequested = !visible;
if (!wtoken.startingDisplayed) {
if (DEBUG_APP_TRANSITIONS) Slog.v(
TAG, "Setting dummy animation on: " + wtoken);
wtoken.mAppAnimator.setDummyAnimation();
}
mOpeningApps.remove(wtoken);
mClosingApps.remove(wtoken);
wtoken.waitingToShow = wtoken.waitingToHide = false;
wtoken.inPendingTransaction = true;
if (visible) {
mOpeningApps.add(wtoken);