Merge "Don't call TaskView.onRecycle when moving focused task to front" into sc-v2-dev (874d9aff) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1172,7 +1172,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		mMovingTaskView = focusedTaskView;
		removeView(focusedTaskView);
		mMovingTaskView = null;
		focusedTaskView.onRecycle();
		focusedTaskView.resetPersistentViewTransforms();
		addView(focusedTaskView, mTaskViewStartIndex);
		setCurrentPage(mTaskViewStartIndex);

+7 −3

Original line number	Diff line number	Diff line
		@@ -871,6 +871,12 @@ public class TaskView extends FrameLayout implements Reusable {
		setIconAndDimTransitionProgress(iconScale, invert);
		}

		protected void resetPersistentViewTransforms() {
		mNonGridTranslationX = mNonGridTranslationY =
		mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;
		resetViewTransforms();
		}

		protected void resetViewTransforms() {
		// fullscreenTranslation and accumulatedTranslation should not be reset, as
		// resetViewTransforms is called during Quickswitch scrolling.
		@@ -894,9 +900,7 @@ public class TaskView extends FrameLayout implements Reusable {

		@Override
		public void onRecycle() {
		mNonGridTranslationX = mNonGridTranslationY =
		mGridTranslationX = mGridTranslationY = mBoxTranslationY = 0f;
		resetViewTransforms();
		resetPersistentViewTransforms();
		// Clear any references to the thumbnail (it will be re-read either from the cache or the
		// system on next bind)
		mSnapshotView.setThumbnail(mTask, null);