Merge "Revert "Avoiding crash upon pressing Alt-Tab"" into ub-launcher3-master (6b597b82) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import static android.view.MotionEvent.INVALID_POINTER_ID;

		import static com.android.systemui.shared.system.ActivityManagerWrapper
		.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
		import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;
		import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_CLOSING;

		import android.annotation.TargetApi;
		@@ -96,7 +95,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
		private VelocityTracker mVelocityTracker;
		private MotionEventQueue mEventQueue;
		private boolean mIsGoingToHome;
		private final @HitTarget int mDownHitTarget;

		public OtherActivityTouchConsumer(Context base, RunningTaskInfo runningTaskInfo,
		RecentsModel recentsModel, Intent homeIntent, ActivityControlHelper activityControl,
		@@ -115,7 +113,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
		mIsDeferredDownTarget = activityControl.deferStartingActivity(downHitTarget);
		mOverviewCallbacks = overviewCallbacks;
		mTaskOverlayFactory = taskOverlayFactory;
		mDownHitTarget = downHitTarget;
		}

		@Override
		@@ -125,7 +122,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC

		@Override
		public void accept(MotionEvent ev) {
		if (mVelocityTracker == null \|\| mDownHitTarget == HIT_TARGET_NONE) {
		if (mVelocityTracker == null) {
		return;
		}
		switch (ev.getActionMasked()) {
		@@ -282,8 +279,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
		* the animation can still be running.
		*/
		private void finishTouchTracking(MotionEvent ev) {
		if (mDownHitTarget == HIT_TARGET_NONE) return;

		if (mPassedInitialSlop && mInteractionHandler != null) {
		mInteractionHandler.updateDisplacement(getDisplacement(ev) - mStartDisplacement);

		@@ -356,8 +351,6 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC

		@Override
		public void onQuickStep(MotionEvent ev) {
		if (mDownHitTarget == HIT_TARGET_NONE) return;

		if (mIsDeferredDownTarget) {
		// Deferred gesture, start the animation and gesture tracking once we pass the actual
		// touch slop
		@@ -451,8 +444,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
		} else {
		TraceHelper.partitionSection("RecentsController", "Received");
		mInteractionHandler.onRecentsAnimationStart(mController, mTargets,
		mHomeContentInsets, mMinimizedHomeBounds,
		mDownHitTarget != HIT_TARGET_NONE ? mDownPos : null);
		mHomeContentInsets, mMinimizedHomeBounds, mDownPos);
		}
		}
		}