summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <winsonc@google.com> 2016-05-04 16:14:19 -0700
committer Winson Chung <winsonc@google.com> 2016-05-04 23:58:06 +0000
commitd7cb517b4ce10fa98213da18ccdb2261fb797f7c (patch)
tree3340a0be3f8c15ed652446b80cc1c11773748646
parent46768683136242de4240958708587dded637ef64 (diff)
Fixing regression in enter-recents state.
- We should always start the activity when docking to ensure that the launch state is set up correctly. Bug: 28470261 Change-Id: I4aae0dedb95a1c796c72b487b6700da0754e66f3
-rw-r--r--packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
index cf18c41b1cd0..297dec92d9b9 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java
@@ -262,8 +262,9 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
try {
// Check if the top task is in the home stack, and start the recents activity
SystemServicesProxy ssp = Recents.getSystemServices();
- MutableBoolean isHomeStackVisible = new MutableBoolean(false);
- if (!ssp.isRecentsActivityVisible(isHomeStackVisible)) {
+ boolean forceVisible = launchedWhileDockingTask || draggingInRecents;
+ MutableBoolean isHomeStackVisible = new MutableBoolean(forceVisible);
+ if (forceVisible || !ssp.isRecentsActivityVisible(isHomeStackVisible)) {
ActivityManager.RunningTaskInfo runningTask = ssp.getRunningTask();
startRecentsActivity(runningTask, isHomeStackVisible.value || fromHome, animate,
growTarget);