Merge "[Live Tile] Fix a bunch of issues related to touch input" into sc-dev (18fcb432) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -731,7 +731,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
		setIsLikelyToStartNewTask(isLikelyToStartNewTask, false /* animate */);
		mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
		mGestureStarted = true;
		mTaskViewSimulator.setDrawsBelowRecents(true);
		}

		/**
		@@ -958,7 +957,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
		if (endTarget == HOME) {
		duration = Math.max(MIN_OVERSHOOT_DURATION, duration);
		} else if (endTarget == RECENTS) {
		LiveTileOverlay.INSTANCE.startIconAnimation();
		if (mRecentsView != null) {
		int nearestPage = mRecentsView.getPageNearestToCenterOfScreen();
		if (mRecentsView.getNextPage() != nearestPage) {
		@@ -971,9 +969,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
		}
		duration = Math.max(duration, mRecentsView.getScroller().getDuration());
		}
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		mRecentsView.getRunningTaskView().setIsClickableAsLiveTile(false);
		}
		}

		// Let RecentsView handle the scrolling to the task, which we launch in startNewTask()
		@@ -1067,7 +1062,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
		}

		if (mGestureState.getEndTarget() == HOME) {
		mTaskViewSimulator.setDrawsBelowRecents(false);
		getOrientationHandler().adjustFloatingIconStartVelocity(velocityPxPerMs);
		final RemoteAnimationTargetCompat runningTaskTarget = mRecentsAnimationTargets != null
		? mRecentsAnimationTargets.findTask(mGestureState.getRunningTaskId())
		@@ -1453,10 +1447,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
		private void finishCurrentTransitionToRecents() {
		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);
		final TaskView runningTaskView = mRecentsView.getRunningTaskView();
		if (runningTaskView != null) {
		runningTaskView.setIsClickableAsLiveTile(true);
		}
		} else if (!hasTargets() \|\| mRecentsAnimationController == null) {
		// If there are no targets or the animation not started, then there is nothing to finish
		mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,11 @@ public class LiveTileOverlay extends Drawable {
		mIcon = icon;
		}

		// TODO: consider cleaning this up and drawing icon in another way. Previously we place app
		// below launcher during the initial swipe up and render the icon in this live tile overlay.
		// However, this resulted in a bunch of touch input issues caused by Launcher getting the input
		// events during transition (to overview / to another app (quick switch). So now our new
		// solution places app on top in live tile until it fully settles in Overview.
		public void startIconAnimation() {
		if (mIconAnimator != null) {
		mIconAnimator.cancel();

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -356,10 +356,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		return false;
		}

		public void setIsClickableAsLiveTile(boolean isClickableAsLiveTile) {
		mIsClickableAsLiveTile = isClickableAsLiveTile;
		}

		private void computeAndSetIconTouchDelegate() {
		float iconHalfSize = mIconView.getWidth() / 2f;
		mIconCenterCoords[0] = mIconCenterCoords[1] = iconHalfSize;