diff options
| author | Winson Chung <winsonc@google.com> | 2014-05-19 21:13:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-19 21:13:13 +0000 |
| commit | 4661a2574a9936bae7207077e975ded66b91ec29 (patch) | |
| tree | ade2c098ddaba7ec76e22c6dc4157ba38479bb9a /packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java | |
| parent | 510eb068b493b94a3fc4eef1ba33893fa2b12fa6 (diff) | |
| parent | 6cb485fd2e2f8ace05e1ff281ab0fc824d3652cb (diff) | |
| download | frameworks_base-4661a2574a9936bae7207077e975ded66b91ec29.zip frameworks_base-4661a2574a9936bae7207077e975ded66b91ec29.tar.gz frameworks_base-4661a2574a9936bae7207077e975ded66b91ec29.tar.bz2 | |
Merge "Fixing regression in dismissing Recents."
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 325e4b0..591b175 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -83,8 +83,13 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView Console.log(Constants.Log.App.SystemUIHandshake, "[RecentsActivity|serviceBroadcast]", action, Console.AnsiRed); if (action.equals(RecentsService.ACTION_HIDE_RECENTS_ACTIVITY)) { - // Dismiss recents, launching the focused task - dismissRecentsIfVisible(); + if (intent.getBooleanExtra(RecentsService.EXTRA_TRIGGERED_FROM_ALT_TAB, false)) { + // Dismiss recents, launching the focused task + dismissRecentsIfVisible(); + } else { + // Otherwise, just finish the activity without launching any other activities + finish(); + } } else if (action.equals(RecentsService.ACTION_TOGGLE_RECENTS_ACTIVITY)) { // Try and unfilter and filtered stacks if (!mRecentsView.unfilterFilteredStacks()) { |