am bf50200b: Merge change Ic9568e39 into eclair
Merge commit 'bf50200ba494db0ac2ce655a95f76640f49355ee' into eclair-mr2
* commit 'bf50200ba494db0ac2ce655a95f76640f49355ee':
When tasks are moved to top or bottom, the app tokens are being rearranged.
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 0f2367d..a47bce6 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -9620,6 +9620,10 @@
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;
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 56270f4..c3aeca4 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -7182,7 +7182,6 @@
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 @@
mNoAnimActivities.add(r);
}
} else {
- mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_FRONT);
+ mWindowManager.prepareAppTransition(WindowManagerPolicy.TRANSIT_TASK_TO_BACK);
}
mWindowManager.moveAppTokensToBottom(moved);
if (VALIDATE_TOKENS) {