Merge "Dismiss recents to home without animation when resizing task." (e70dfdcd) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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();

+6 −6

Original line number	Diff line number	Diff line
		@@ -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]);