drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Ic9568e39 into eclair

Browse Source 
* changes:
  When tasks are moved to top or bottom, the app tokens are being rearranged. The window token rearrangement is defered if an animation is underway. Force a focus recomputation when the window tokens are finally rearranged so that we have a valid focused window.
This commit is contained in:
Android (Google) Code Review
2009-11-06 02:12:40 -05:00
parent 84872738f2 c9568e3989
commit bf50200ba4
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9629,6 +9629,10 @@ public class WindowManagerService extends IWindowManager.Stub
moveInputMethodWindowsIfNeededLocked(false);
wallpaperMayChange = true;
mLayoutNeeded = true;
// Since the window list has been rebuilt, focus might
// have to be recomputed since the actual order of windows
// might have changed again.
focusMayChange = true;
}
int adjResult = 0;

3
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -7182,7 +7182,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
if (DEBUG_TRANSITION) Log.v(TAG,
"Prepare to back transition: task=" + task);
mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_BACK);
final int N = mHistory.size();
int bottom = 0;
@ -7212,7 +7211,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
mNoAnimActivities.add(r);
}
} else {
mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_FRONT);
mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_BACK);
}
mWindowManager.moveAppTokensToBottom(moved);
if (VALIDATE_TOKENS) {