diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-25 17:02:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 17:02:13 +0000 |
| commit | df7da51311331d4d7bfe67699217246d187f6c3b (patch) | |
| tree | 248b7f9562bac66c47830014838e4676d8c2f9da /services/java | |
| parent | dab65ff2445e14f8e65c5690054f16d13b6f0aad (diff) | |
| parent | ca903d3809ccd78b73b634ff7591863dbed55823 (diff) | |
| download | frameworks_base-df7da51311331d4d7bfe67699217246d187f6c3b.zip frameworks_base-df7da51311331d4d7bfe67699217246d187f6c3b.tar.gz frameworks_base-df7da51311331d4d7bfe67699217246d187f6c3b.tar.bz2 | |
am ca903d38: am 81e094d7: Merge "Move task to top in window manager." into klp-dev
* commit 'ca903d3809ccd78b73b634ff7591863dbed55823':
Move task to top in window manager.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index 62e1340..d616f1b 100644 --- a/services/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/java/com/android/server/am/ActivityStackSupervisor.java @@ -1709,6 +1709,7 @@ public final class ActivityStackSupervisor { TaskRecord sourceTask = sourceRecord.task; targetStack = sourceTask.stack; moveHomeStack(targetStack.isHomeStack()); + mWindowManager.moveTaskToTop(sourceTask.taskId); if (!addingToTask && (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) { // In this case, we are adding the activity to an existing @@ -1767,6 +1768,7 @@ public final class ActivityStackSupervisor { r.setTask(prev != null ? prev.task : targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true), null, true); + mWindowManager.moveTaskToTop(r.task.taskId); if (DEBUG_TASKS) Slog.v(TAG, "Starting new activity " + r + " in new guessed " + r.task); } |