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

Merge "Start drag from current translation shift during animation." into udc-qpr-dev am: 62b59f9a81 am: 268ba3f6dc

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

Change-Id: I5d15dfe1cb24fec970552d14e5c2b75beed3e816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brian Isganitis
2023-07-20 00:19:16 +00:00
committed by Automerger Merge Worker
parent 08b99d7563 268ba3f6dc
commit 4b43de28fa
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/views/AbstractSlideInView.java
+11 -4
View File
@@ -94,6 +94,8 @@ public abstract class AbstractSlideInView<T extends Context & ActivityContext>
// range [0, 1], 0=> completely open, 1=> completely closed
protected float mTranslationShift = TRANSLATION_SHIFT_CLOSED;
/** {@link #mTranslationShift} at the invocation of {@link #onDragStart(boolean, float)}. */
protected float mDragStartTranslationShift;
protected boolean mNoIntercept;
protected @Nullable OnCloseListener mOnCloseBeginListener;
@@ -285,18 +287,23 @@ public abstract class AbstractSlideInView<T extends Context & ActivityContext>
/* SingleAxisSwipeDetector.Listener */
@Override
public void onDragStart(boolean start, float startDisplacement) { }
public void onDragStart(boolean start, float startDisplacement) {
mOpenCloseAnimator.cancel();
mDragStartTranslationShift = mTranslationShift;
}
@Override
public boolean onDrag(float displacement) {
float range = getShiftRange();
displacement = Utilities.boundToRange(displacement, 0, range);
setTranslationShift(displacement / range);
setTranslationShift(Utilities.boundToRange(
mDragStartTranslationShift + displacement / getShiftRange(),
TRANSLATION_SHIFT_OPENED,
TRANSLATION_SHIFT_CLOSED));
return true;
}
@Override
public void onDragEnd(float velocity) {
mDragStartTranslationShift = 0;
float successfulShiftThreshold = mActivityContext.getDeviceProfile().isTablet
? TABLET_BOTTOM_SHEET_SUCCESS_TRANSITION_PROGRESS : SUCCESS_TRANSITION_PROGRESS;
if ((mSwipeDetector.isFling(velocity) && velocity > 0)