Merge QQ1A.191205.011 into stage-aosp-master (5cc9ace2) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/RecentsAnimationWrapper.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ import static android.view.MotionEvent.ACTION_CANCEL;
		import static android.view.MotionEvent.ACTION_DOWN;
		import static android.view.MotionEvent.ACTION_UP;

		import android.os.SystemClock;
		import android.util.Log;
		import android.view.InputEvent;
		import android.view.KeyEvent;
		import android.view.MotionEvent;
		@@ -38,6 +40,8 @@ import java.util.function.Supplier;
		*/
		public class RecentsAnimationWrapper {

		private static final String TAG = "RecentsAnimationWrapper";

		// A list of callbacks to run when we receive the recents animation target. There are different
		// than the state callbacks as these run on the current worker thread.
		private final ArrayList<Runnable> mCallbacks = new ArrayList<>();
		@@ -125,6 +129,7 @@ public class RecentsAnimationWrapper {
		boolean sendUserLeaveHint) {
		SwipeAnimationTargetSet controller = targetSet;
		targetSet = null;
		disableInputProxy();
		if (controller != null) {
		controller.finishController(toRecents, onFinishComplete, sendUserLeaveHint);
		}
		@@ -153,6 +158,16 @@ public class RecentsAnimationWrapper {
		mInputConsumerController.setInputListener(this::onInputConsumerEvent);
		}

		private void disableInputProxy() {
		if (mInputConsumer != null && mTouchInProgress) {
		long now = SystemClock.uptimeMillis();
		MotionEvent dummyCancel = MotionEvent.obtain(now, now, ACTION_CANCEL, 0, 0, 0);
		mInputConsumer.onMotionEvent(dummyCancel);
		dummyCancel.recycle();
		}
		mInputConsumerController.setInputListener(null);
		}

		private boolean onInputConsumerEvent(InputEvent ev) {
		if (ev instanceof MotionEvent) {
		onInputConsumerMotionEvent((MotionEvent) ev);
		@@ -168,6 +183,18 @@ public class RecentsAnimationWrapper {

		private boolean onInputConsumerMotionEvent(MotionEvent ev) {
		int action = ev.getAction();

		// Just to be safe, verify that ACTION_DOWN comes before any other action,
		// and ignore any ACTION_DOWN after the first one (though that should not happen).
		if (!mTouchInProgress && action != ACTION_DOWN) {
		Log.w(TAG, "Received non-down motion before down motion: " + action);
		return false;
		}
		if (mTouchInProgress && action == ACTION_DOWN) {
		Log.w(TAG, "Received down motion while touch was already in progress");
		return false;
		}

		if (action == ACTION_DOWN) {
		mTouchInProgress = true;
		if (mInputConsumer == null) {

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -923,8 +923,16 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		windowAnim.addListener(new AnimationSuccessListener() {
		@Override
		public void onAnimationSuccess(Animator animator) {
		if (target == NEW_TASK && mRecentsView != null
		&& mRecentsView.getNextPage() == mRecentsView.getRunningTaskIndex()) {
		// We are about to launch the current running task, so use LAST_TASK state
		// instead of NEW_TASK. This could happen, for example, if our scroll is
		// aborted after we determined the target to be NEW_TASK.
		setStateOnUiThread(LAST_TASK.endState);
		} else {
		setStateOnUiThread(target.endState);
		}
		}
		});
		windowAnim.start();
		mRunningWindowAnim = RunningWindowAnim.wrap(windowAnim);

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.quickstep.views;

		import static androidx.dynamicanimation.animation.DynamicAnimation.MIN_VISIBLE_CHANGE_PIXELS;

		import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
		import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_ICON_PARAMS;
		import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
		@@ -572,10 +571,14 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		final TaskView taskView = (TaskView) getChildAt(pageIndex);
		taskView.bind(task);
		}

		if (mNextPage == INVALID_PAGE) {
		// Set the current page to the running task, but not if settling on new task.
		TaskView runningTaskView = getRunningTaskView();
		if (runningTaskView != null) {
		setCurrentPage(indexOfChild(runningTaskView));
		}
		}

		if (mIgnoreResetTaskId != -1 && getTaskView(mIgnoreResetTaskId) != ignoreRestTaskView) {
		// If the taskView mapping is changing, do not preserve the visuals. Since we are

src/com/android/launcher3/PagedView.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -1088,9 +1088,11 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
		if (mFreeScroll) {
		setCurrentPage(getNextPage());
		} else if (wasFreeScroll) {
		if (getScrollForPage(getNextPage()) != getScrollX()) {
		snapToPage(getNextPage());
		}
		}
		}

		protected void setEnableOverscroll(boolean enable) {
		mAllowOverScroll = enable;