Snap for 5743138 from 5841e40a95b2d01386d83b83abeef9b150d833c5 to qt-qpr1-release (585f11d1) · Commits · e / os / android_packages_apps_Trebuchet

go/quickstep/src/com/android/quickstep/TouchInteractionService.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ import android.view.MotionEvent;

		import com.android.launcher3.Utilities;
		import com.android.launcher3.compat.UserManagerCompat;
		import com.android.launcher3.util.LooperExecutor;
		import com.android.launcher3.util.UiThreadHelper;
		import com.android.systemui.shared.recents.IOverviewProxy;
		import com.android.systemui.shared.recents.ISystemUiProxy;

		@@ -137,6 +139,9 @@ public class TouchInteractionService extends Service {
		return sConnected;
		}

		public static final LooperExecutor BACKGROUND_EXECUTOR =
		new LooperExecutor(UiThreadHelper.getBackgroundLooper());

		private RecentsModel mRecentsModel;
		private OverviewComponentObserver mOverviewComponentObserver;
		private OverviewCommandHelper mOverviewCommandHelper;
		@@ -180,4 +185,8 @@ public class TouchInteractionService extends Service {
		}
		return mMyBinder;
		}

		public static boolean isInputMonitorInitialized() {
		return true;
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		package="com.android.launcher3" >

		<uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
		<uses-permission android:name="android.permission.VIBRATE" />

		<application
		android:backupAgent="com.android.launcher3.LauncherBackupAgent"

+15 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,21 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {
		mMotionPauseDetector.clear();
		}

		@Override
		protected void goToTargetState(LauncherState targetState, int logAction) {
		if (mPeekAnim != null && mPeekAnim.isStarted()) {
		// Don't jump to the target state until overview is no longer peeking.
		mPeekAnim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		FlingAndHoldTouchController.super.goToTargetState(targetState, logAction);
		}
		});
		} else {
		super.goToTargetState(targetState, logAction);
		}
		}

		@Override
		protected void updateAnimatorBuilderOnReinit(AnimatorSetBuilder builder) {
		if (handlingOverviewAnim()) {

0 → 100644

+496 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −10

Original line number	Diff line number	Diff line
		@@ -151,16 +151,10 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
		@NonNull
		@Override
		public RectF getWindowTargetRect() {
		final int halfIconSize = dp.iconSizePx / 2;
		final float targetCenterX = dp.availableWidthPx / 2f;
		final float targetCenterY = dp.availableHeightPx - dp.hotseatBarSizePx;

		if (canUseWorkspaceView) {
		return iconLocation;
		} else {
		// Fallback to animate to center of screen.
		return new RectF(targetCenterX - halfIconSize, targetCenterY - halfIconSize,
		targetCenterX + halfIconSize, targetCenterY + halfIconSize);
		return HomeAnimationFactory.getDefaultWindowTargetRect(dp);
		}
		}

		@@ -194,9 +188,6 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
		@Override
		public AnimationFactory prepareRecentsUI(Launcher activity, boolean activityVisible,
		boolean animateActivity, Consumer<AnimatorPlaybackController> callback) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "prepareRecentsUI");
		}
		final LauncherState startState = activity.getStateManager().getState();

		LauncherState resetState = startState;