Merge "Dismiss recents to home without animation when resizing task."

2 files changed, 12 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 130d3bc..011c02e 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -341,6 +341,12 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
         }
     }
 
+    /** Dismisses Recents directly to Home without transition animation. */
+    void dismissRecentsToHomeWithoutTransitionAnimation() {
+        finish();
+        overridePendingTransition(0, 0);
+    }
+
     /** Dismisses Recents directly to Home if we currently aren't transitioning. */
     boolean dismissRecentsToHome(boolean animated) {
         SystemServicesProxy ssp = RecentsTaskLoader.getInstance().getSystemServicesProxy();
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsResizeTaskDialog.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsResizeTaskDialog.java
index 4cd577d..b701e0b 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsResizeTaskDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsResizeTaskDialog.java
@@ -209,6 +209,10 @@ public class RecentsResizeTaskDialog extends DialogFragment {
             }
         }
 
+        // Get rid of the dialog.
+        dismiss();
+        mRecentsActivity.dismissRecentsToHomeWithoutTransitionAnimation();
+
         // Resize all tasks beginning from the "oldest" one.
         for (int i = additionalTasks; i >= 0; --i) {
             if (mTasks[i] != null) {
@@ -216,12 +220,8 @@ public class RecentsResizeTaskDialog extends DialogFragment {
             }
         }
 
-        // Get rid of the dialog.
-        dismiss();
-        mRecentsActivity.dismissRecentsToHomeRaw(false);
-
-        // Show tasks - beginning with the oldest so that the focus ends on the selected one.
-        // TODO: Remove this once issue b/19893373 is resolved.
+        // Show tasks as they might not be currently visible - beginning with the oldest so that
+        // the focus ends on the selected one.
         for (int i = additionalTasks; i >= 0; --i) {
             if (mTasks[i] != null) {
                 mRecentsView.launchTask(mTasks[i]);