Merge "Toggling minimized state with overview moves divider to correct position" into oc-dev (7f93567f) · Commits · e / os / android_frameworks_base

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -362,11 +362,17 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
		* Cancels any current transform animations.
		*/
		public void cancelTransformAnimation() {
		cancelDimAnimationIfExists();
		Utilities.cancelAnimationWithoutCallbacks(mTransformAnimation);
		Utilities.cancelAnimationWithoutCallbacks(mDimAnimator);
		Utilities.cancelAnimationWithoutCallbacks(mOutlineAnimator);
		}

		private void cancelDimAnimationIfExists() {
		if (mDimAnimator != null) {
		mDimAnimator.cancel();
		}
		}

		/** Enables/disables handling touch on this task view. */
		public void setTouchEnabled(boolean enabled) {
		setOnClickListener(enabled ? this : null);
		@@ -546,7 +552,7 @@ public class TaskView extends FixedSizeFrameLayout implements Task.TaskCallbacks
		@Override
		public void onStartLaunchTargetEnterAnimation(TaskViewTransform transform, int duration,
		boolean screenPinningEnabled, ReferenceCountedTrigger postAnimationTrigger) {
		Utilities.cancelAnimationWithoutCallbacks(mDimAnimator);
		cancelDimAnimationIfExists();

		// Dim the view after the app window transitions down into recents
		postAnimationTrigger.increment();

+1 −1

Original line number	Diff line number	Diff line
		@@ -767,7 +767,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		mDockedStackMinimized = minimized;
		} else if (mDockedStackMinimized != minimized) {
		mIsInMinimizeInteraction = true;
		if (minimized) {
		if (minimized && (mCurrentAnimator == null \|\| !mCurrentAnimator.isRunning())) {
		mDividerPositionBeforeMinimized = getCurrentPosition();
		}
		mMinimizedSnapAlgorithm = null;