Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev (f47658f1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
		import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID;
		import static android.app.ActivityManager.StackId.INVALID_STACK_ID;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.annotation.IntDef;
		@@ -1496,11 +1498,6 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
		// Remove the task from the ignored set
		removeIgnoreTask(removedTask);

		// Resize the grid layout task view focus frame
		if (mTaskViewFocusFrame != null) {
		mTaskViewFocusFrame.resize();
		}

		// If requested, relayout with the given animation
		if (animation != null) {
		updateLayoutAlgorithm(true /* boundScroll */);
		@@ -1838,6 +1835,17 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
		announceForAccessibility(getContext().getString(
		R.string.accessibility_recents_item_dismissed, event.task.title));

		if (useGridLayout() && event.animation != null) {
		event.animation.setListener(new AnimatorListenerAdapter() {
		public void onAnimationEnd(Animator animator) {
		if (mTaskViewFocusFrame != null) {
		// Resize the grid layout task view focus frame
		mTaskViewFocusFrame.resize();
		}
		}
		});
		}

		// Remove the task from the stack
		mStack.removeTask(event.task, event.animation, false /* fromDockGesture */);
		EventBus.getDefault().send(new DeleteTaskDataEvent(event.task));

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,6 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
		return super.onInterceptTouchEvent(ev);
		}


		@Override
		protected void measureContents(int width, int height) {
		int widthWithoutPadding = width - mPaddingLeft - mPaddingRight;