diff options
| author | Winson Chung <winsonc@google.com> | 2015-08-11 02:40:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 02:40:05 +0000 |
| commit | bc58c9453fd4f647a3382608f8de8e557854758d (patch) | |
| tree | 4653dd4d7ce0bb6e302664bef41a8ec81db24999 | |
| parent | 3767d85caac8eec6c7c219de3d0a000fca18ad8b (diff) | |
| parent | c00b1067a05116548a0883e1400a1c4715078797 (diff) | |
| download | frameworks_base-bc58c9453fd4f647a3382608f8de8e557854758d.zip frameworks_base-bc58c9453fd4f647a3382608f8de8e557854758d.tar.gz frameworks_base-bc58c9453fd4f647a3382608f8de8e557854758d.tar.bz2 | |
am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev
* commit 'c00b1067a05116548a0883e1400a1c4715078797':
Pushing the startActivity before the calls to remove task.
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index abdebf3..0068f84 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -1121,9 +1121,6 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal mViewPool.returnViewToPool(tv); } - // Notify the callback that we've removed the task and it can clean up after it - mCb.onTaskViewDismissed(removedTask); - // Get the stack scroll of the task to anchor to (since we are removing something, the front // most task will be our anchor task) Task anchorTask = null; @@ -1172,6 +1169,11 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // Fade the dismiss button back in showDismissAllButton(); } + + // Notify the callback that we've removed the task and it can clean up after it. Note, we + // do this after onAllTaskViewsDismissed() is called, to allow the home activity to be + // started before the call to remove the task. + mCb.onTaskViewDismissed(removedTask); } @Override |
