Fix recents scale sometimes lagging behind window scale
We were previously offsetting the launcher animation progress based on when we got onGestureStart, which meant it would lag behind if onGestureStart came late. Now that we track the window instead of the launcher shelf, and we don't show the launcher animation right away in fully gestural mode anyway, we should remove this to ensure the launcher part of the animation always lines up with the app window. We also reapply state whenever predictions are enabled, e.g. when launcher starts after being force stopped, and previously this was canceling the existing state animation. We don't want to do that because predictions can be enabled at any point on a cold start, and cancelling the existing state animation means that RecentsView shows up in fullscreen and not attached to the app window for the duration of the gesture. Bug: 144454486 Change-Id: I65a2c71c9acd2f5345941ea2cff7d32c04b7be3f
This commit is contained in:
+1
-1
@@ -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();
|
||||
|
||||
@@ -167,8 +167,6 @@ public class LauncherSwipeHandler<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;
|
||||
|
||||
@@ -574,9 +572,7 @@ public class LauncherSwipeHandler<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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -626,7 +622,6 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
|
||||
@Override
|
||||
public void onGestureStarted() {
|
||||
notifyGestureStartedAsync();
|
||||
mShiftAtGestureStart = mCurrentShift.value;
|
||||
mStateCallback.setStateOnUiThread(STATE_GESTURE_STARTED);
|
||||
mGestureStarted = true;
|
||||
}
|
||||
|
||||
@@ -507,12 +507,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 : getFakeRotationMode(mDeviceProfile);
|
||||
}
|
||||
getRootView().dispatchInsets();
|
||||
getStateManager().reapplyState(true /* cancelCurrentAnimation */);
|
||||
getStateManager().reapplyState(cancelCurrentAnimation);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user