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

am d7cd29da: Add facility to run setup wizard after an update.

Browse Source 
Merge commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1'

* commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1':
  Add facility to run setup wizard after an update.
This commit is contained in:
Dianne Hackborn
2009-07-03 08:58:10 -07:00
committed by The Android Open Source Project
parent 575d1af980 d7cd29da91
commit 5d16cd0462
4 changed files with 135 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/WindowManagerService.java
View File

@@ -2332,6 +2332,14 @@ public class WindowManagerService extends IWindowManager.Stub implements Watchdo
if (!mDisplayFrozen) {
if (mNextAppTransition == WindowManagerPolicy.TRANSIT_NONE) {
mNextAppTransition = transit;
} else if (transit == WindowManagerPolicy.TRANSIT_TASK_OPEN
&& mNextAppTransition == WindowManagerPolicy.TRANSIT_TASK_CLOSE) {
// Opening a new task always supersedes a close for the anim.
mNextAppTransition = transit;
} else if (transit == WindowManagerPolicy.TRANSIT_ACTIVITY_OPEN
&& mNextAppTransition == WindowManagerPolicy.TRANSIT_ACTIVITY_CLOSE) {
// Opening a new activity always supersedes a close for the anim.
mNextAppTransition = transit;
}
mAppTransitionReady = false;
mAppTransitionTimeout = false;