PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15092224

Change-Id: I0b5bf7477474db566644c4b5f69cabdb56369b6c
This commit is contained in:
TreeHugger Robot
2021-06-24 22:05:55 +00:00
committed by Automerger Merge Worker
parent ec551791ab c48d40475b
commit e14ba668cb
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+2 -5
View File
@@ -230,7 +230,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
// Used to control launcher components throughout the swipe gesture. // Used to control launcher components throughout the swipe gesture.
private AnimatorControllerWithResistance mLauncherTransitionController; private AnimatorControllerWithResistance mLauncherTransitionController;
private boolean mHasEndedLauncherTransition;
private AnimationFactory mAnimationFactory = (t) -> { }; private AnimationFactory mAnimationFactory = (t) -> { };
@@ -604,11 +603,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
/** /**
* We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME * We don't want to change mLauncherTransitionController if mGestureState.getEndTarget() == HOME
* (it has its own animation) or if we explicitly ended the controller already. * (it has its own animation).
* @return Whether we can create the launcher controller or update its progress. * @return Whether we can create the launcher controller or update its progress.
*/ */
private boolean canCreateNewOrUpdateExistingLauncherTransitionController() { private boolean canCreateNewOrUpdateExistingLauncherTransitionController() {
return mGestureState.getEndTarget() != HOME && !mHasEndedLauncherTransition; return mGestureState.getEndTarget() != HOME;
} }
@Override @Override
@@ -1422,8 +1421,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
} }
private void endLauncherTransitionController() { private void endLauncherTransitionController() {
mHasEndedLauncherTransition = true;
if (mLauncherTransitionController != null) { if (mLauncherTransitionController != null) {
// End the animation, but stay at the same visual progress. // End the animation, but stay at the same visual progress.
mLauncherTransitionController.getNormalController().dispatchSetInterpolator( mLauncherTransitionController.getNormalController().dispatchSetInterpolator(
quickstep/src/com/android/quickstep/views/RecentsView.java
+1 -8
View File
@@ -1251,9 +1251,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
private void updateOrientationHandler() { private void updateOrientationHandler() {
// Handle orientation changes. // Handle orientation changes.
PagedOrientationHandler oldOrientationHandler = mOrientationHandler;
mOrientationHandler = mOrientationState.getOrientationHandler(); mOrientationHandler = mOrientationState.getOrientationHandler();
mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources()); mIsRtl = mOrientationHandler.getRecentsRtlSetting(getResources());
setLayoutDirection(mIsRtl setLayoutDirection(mIsRtl
? View.LAYOUT_DIRECTION_RTL ? View.LAYOUT_DIRECTION_RTL
@@ -1262,12 +1260,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
? View.LAYOUT_DIRECTION_LTR ? View.LAYOUT_DIRECTION_LTR
: View.LAYOUT_DIRECTION_RTL); : View.LAYOUT_DIRECTION_RTL);
mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated()); mClearAllButton.setRotation(mOrientationHandler.getDegreesRotated());
mActivity.getDragLayer().recreateControllers();
if (!mOrientationHandler.equals(oldOrientationHandler)) {
// Changed orientations, update controllers so they intercept accordingly.
mActivity.getDragLayer().recreateControllers();
}
boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0 boolean isInLandscape = mOrientationState.getTouchRotation() != ROTATION_0
|| mOrientationState.getRecentsActivityRotation() != ROTATION_0; || mOrientationState.getRecentsActivityRotation() != ROTATION_0;
mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION, mActionsView.updateHiddenFlags(HIDDEN_NON_ZERO_ROTATION,