diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2015-04-22 15:30:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 15:30:24 +0000 |
| commit | 58f68b56ea84c8d84937d9ec5210bdf71b2b9acc (patch) | |
| tree | a951888e932426e0e9dbdd0315a012a3933234b6 | |
| parent | 81786701b61f8295c8f7c9c1861642233910b056 (diff) | |
| parent | 2d0f39bf33b9f3dc90ce4d8bc34d59e00a06658d (diff) | |
| download | frameworks_base-58f68b56ea84c8d84937d9ec5210bdf71b2b9acc.zip frameworks_base-58f68b56ea84c8d84937d9ec5210bdf71b2b9acc.tar.gz frameworks_base-58f68b56ea84c8d84937d9ec5210bdf71b2b9acc.tar.bz2 | |
Merge "Move home task to front when home stack is moved to front."
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/TaskRecord.java | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 497abfb..8c98f9f 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -464,7 +464,7 @@ public final class ActivityStackSupervisor implements DisplayListener { mHomeStack.moveHomeStackTaskToTop(homeStackTaskType); - final ActivityRecord top = mHomeStack.topRunningActivityLocked(null); + final ActivityRecord top = getHomeActivity(); if (top == null) { return false; } @@ -487,7 +487,8 @@ public final class ActivityStackSupervisor implements DisplayListener { prev.task.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE); } - ActivityRecord r = mHomeStack.topRunningActivityLocked(null); + mHomeStack.moveHomeStackTaskToTop(homeStackTaskType); + ActivityRecord r = getHomeActivity(); if (r != null) { mService.setFocusedActivityLocked(r, reason); return resumeTopActivitiesLocked(mHomeStack, prev, null); diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 790a78d..f3b4516 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -385,10 +385,8 @@ final class TaskRecord { } void setTaskToReturnTo(int taskToReturnTo) { - if (IGNORE_RETURN_TO_RECENTS && taskToReturnTo == RECENTS_ACTIVITY_TYPE) { - taskToReturnTo = HOME_ACTIVITY_TYPE; - } - mTaskToReturnTo = taskToReturnTo; + mTaskToReturnTo = (IGNORE_RETURN_TO_RECENTS && taskToReturnTo == RECENTS_ACTIVITY_TYPE) + ? HOME_ACTIVITY_TYPE : taskToReturnTo; } int getTaskToReturnTo() { |