Merge "Fix recents scale sometimes lagging behind window scale" into ub-launcher3-qt-future-dev (f3761296) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ public class PredictionRowView extends LinearLayout implements
		boolean predictionsEnabled = predictionCount > 0;
		if (predictionsEnabled != mPredictionsEnabled) {
		mPredictionsEnabled = predictionsEnabled;
		mLauncher.reapplyUi();
		mLauncher.reapplyUi(false /* cancelCurrentAnimation */);
		updateVisibility();
		}
		mParent.onHeightUpdated();

+1 −6

Original line number	Diff line number	Diff line
		@@ -206,8 +206,6 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		private boolean mIsShelfPeeking;

		private boolean mContinuingLastGesture;
		// To avoid UI jump when gesture is started, we offset the animation by the threshold.
		private float mShiftAtGestureStart = 0;

		private ThumbnailData mTaskSnapshot;

		@@ -580,9 +578,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		// Normalize the progress to 0 to 1, as the animation controller will clamp it to that
		// anyway. The controller mimics the drag length factor by applying it to its interpolators.
		float progress = mCurrentShift.value / mDragLengthFactor;
		mLauncherTransitionController.setPlayFraction(
		progress <= mShiftAtGestureStart \|\| mShiftAtGestureStart >= 1
		? 0 : (progress - mShiftAtGestureStart) / (1 - mShiftAtGestureStart));
		mLauncherTransitionController.setPlayFraction(progress);
		}

		/**
		@@ -622,7 +618,6 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		@Override
		public void onGestureStarted() {
		notifyGestureStartedAsync();
		mShiftAtGestureStart = mCurrentShift.value;
		setStateOnUiThread(STATE_GESTURE_STARTED);
		mGestureStarted = true;
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -446,12 +446,16 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

		@Override
		public void reapplyUi() {
		reapplyUi(true /* cancelCurrentAnimation */);
		}

		public void reapplyUi(boolean cancelCurrentAnimation) {
		if (supportsFakeLandscapeUI()) {
		mRotationMode = mStableDeviceProfile == null
		? RotationMode.NORMAL : UiFactory.getRotationMode(mDeviceProfile);
		}
		getRootView().dispatchInsets();
		getStateManager().reapplyState(true /* cancelCurrentAnimation */);
		getStateManager().reapplyState(cancelCurrentAnimation);
		}

		@Override