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

am 750e82e5: am bf50200b: Merge change Ic9568e39 into eclair

Browse Source 
Merge commit '750e82e51921428dc4ad9a75f18b02b8048734d8' into eclair-mr2-plus-aosp

* commit '750e82e51921428dc4ad9a75f18b02b8048734d8':
  When tasks are moved to top or bottom, the app tokens are being rearranged.
This commit is contained in:
Suchi Amalapurapu
2009-11-06 00:30:40 -08:00
committed by Android Git Automerger
parent a9e47546a5 750e82e519
commit 972bad3cb8
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

@@ -9620,6 +9620,10 @@ public class WindowManagerService extends IWindowManager.Stub
moveInputMethodWindowsIfNeededLocked(false); moveInputMethodWindowsIfNeededLocked(false);
wallpaperMayChange = true; wallpaperMayChange = true;
mLayoutNeeded = 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; int adjResult = 0;

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

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