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

Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496

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

Change-Id: I9ecbc2efa905f1dd545a2b735fb020b378e5fd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Schneider Victor-tulias
2023-07-10 19:08:35 +00:00
committed by Automerger Merge Worker
parent b708191740 3d1e78a496
commit ea547ecb4a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/inputconsumers/ProgressDelegateInputConsumer.java
+2 -1
View File
@@ -103,7 +103,8 @@ public class ProgressDelegateInputConsumer implements InputConsumer,
mStateCallback = new MultiStateCallback(STATE_NAMES); mStateCallback = new MultiStateCallback(STATE_NAMES);
mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_HANDLER_INVALIDATED, mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_HANDLER_INVALIDATED,
this::endRemoteAnimation); this::endRemoteAnimation);
mStateCallback.runOnceAtState(STATE_FLING_FINISHED, this::onFlingFinished); mStateCallback.runOnceAtState(STATE_TARGET_RECEIVED | STATE_FLING_FINISHED,
this::onFlingFinished);
mSwipeDetector = new SingleAxisSwipeDetector(mContext, this, VERTICAL); mSwipeDetector = new SingleAxisSwipeDetector(mContext, this, VERTICAL);
mSwipeDetector.setDetectableScrollConditions(DIRECTION_POSITIVE, false); mSwipeDetector.setDetectableScrollConditions(DIRECTION_POSITIVE, false);
quickstep/src/com/android/quickstep/interaction/AllSetActivity.java
+5 -5
View File
@@ -254,6 +254,9 @@ public class AllSetActivity extends Activity {
mBinder.setSwipeUpProxy(isResumed() ? this::createSwipeUpProxy : null); mBinder.setSwipeUpProxy(isResumed() ? this::createSwipeUpProxy : null);
mBinder.setOverviewTargetChangeListener(mBinder::preloadOverviewForSUWAllSet); mBinder.setOverviewTargetChangeListener(mBinder::preloadOverviewForSUWAllSet);
mBinder.preloadOverviewForSUWAllSet(); mBinder.preloadOverviewForSUWAllSet();
if (mTaskbarManager != null) {
mLauncherStartAnim = mTaskbarManager.createLauncherStartFromSuwAnim(MAX_SWIPE_DURATION);
}
} }
@Override @Override
@@ -328,12 +331,9 @@ public class AllSetActivity extends Activity {
mRootView.setAlpha(alpha); mRootView.setAlpha(alpha);
mRootView.setTranslationY((alpha - 1) * mSwipeUpShift); mRootView.setTranslationY((alpha - 1) * mSwipeUpShift);
if (mLauncherStartAnim == null && mTaskbarManager != null) {
mLauncherStartAnim = mTaskbarManager.createLauncherStartFromSuwAnim(MAX_SWIPE_DURATION);
}
if (mLauncherStartAnim != null) { if (mLauncherStartAnim != null) {
mLauncherStartAnim.setPlayFraction(Utilities.mapBoundToRange( mLauncherStartAnim.setPlayFraction(
mSwipeProgress.value, 0, 1, 0, 1, FAST_OUT_SLOW_IN)); FAST_OUT_SLOW_IN.getInterpolation(mSwipeProgress.value));
} }
maybeResumeOrPauseBackgroundAnimation(); maybeResumeOrPauseBackgroundAnimation();
} }