aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of CATCH state in verticalpulldetector

Browse Source 
> There was a bug regarding mLastDisplacement not being cleared out, which
caused a jump of the all apps container.
> Also as a cleanup, got rid of the CATCH state.

Change-Id: Iae9af0be04cce15f2ba4e6734d1615f879921e5d
This commit is contained in:
Hyunyoung Song
2016-06-30 17:22:26 -07:00
parent b1e9e8d662
commit 21b7571b69
2 changed files with 88 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/launcher3/allapps/AllAppsTransitionController.java
View File

@@ -11,7 +11,6 @@ import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
import com.android.launcher3.CellLayout;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Hotseat;
import com.android.launcher3.Launcher;
@@ -100,31 +99,34 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
} else {
// Now figure out which direction scroll events the controller will start
// calling the callbacks.
int conditionsToReportScroll = 0;
int directionsToDetectScroll = 0;
boolean ignoreSlopWhenSettling = false;
if (mDetector.isRestingState()) {
if (mDetector.isIdleState()) {
if (mLauncher.isAllAppsVisible()) {
conditionsToReportScroll |= VerticalPullDetector.THRESHOLD_DOWN;
directionsToDetectScroll |= VerticalPullDetector.DIRECTION_DOWN;
} else {
conditionsToReportScroll |= VerticalPullDetector.THRESHOLD_UP;
directionsToDetectScroll |= VerticalPullDetector.DIRECTION_UP;
}
} else {
if (isInDisallowRecatchBottomZone()) {
conditionsToReportScroll |= VerticalPullDetector.THRESHOLD_UP;
directionsToDetectScroll |= VerticalPullDetector.DIRECTION_UP;
} else if (isInDisallowRecatchTopZone()) {
conditionsToReportScroll |= VerticalPullDetector.THRESHOLD_DOWN;
directionsToDetectScroll |= VerticalPullDetector.DIRECTION_DOWN;
} else {
conditionsToReportScroll |= VerticalPullDetector.THRESHOLD_ONLY;
directionsToDetectScroll |= VerticalPullDetector.DIRECTION_BOTH;
ignoreSlopWhenSettling = true;
}
}
mDetector.setDetectableScrollConditions(conditionsToReportScroll);
mDetector.setDetectableScrollConditions(directionsToDetectScroll,
ignoreSlopWhenSettling);
}
}
if (mNoIntercept) {
return false;
}
mDetector.onTouchEvent(ev);
if (mDetector.isScrollingState() && (isInDisallowRecatchBottomZone() || isInDisallowRecatchTopZone())) {
if (mDetector.isSettlingState() && (isInDisallowRecatchBottomZone() || isInDisallowRecatchTopZone())) {
return false;
}
return mDetector.shouldIntercept();
@@ -132,7 +134,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
private boolean shouldPossiblyIntercept(MotionEvent ev) {
DeviceProfile grid = mLauncher.getDeviceProfile();
if (mDetector.isRestingState()) {
if (mDetector.isIdleState()) {
if (grid.isVerticalBarLayout()) {
if (ev.getY() > mLauncher.getDeviceProfile().heightPx - mBezelSwipeUpHeight) {
return true;
@@ -164,7 +166,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
@Override
public void onScrollStart(boolean start) {
public void onDragStart(boolean start) {
cancelAnimation();
mCurrentAnimation = LauncherAnimUtils.createAnimatorSet();
mShiftStart = mAppsView.getTranslationY();
@@ -172,7 +174,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
@Override
public boolean onScroll(float displacement, float velocity) {
public boolean onDrag(float displacement, float velocity) {
if (mAppsView == null) {
return false; // early termination.
}
@@ -182,7 +184,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
@Override
public void onScrollEnd(float velocity, boolean fling) {
public void onDragEnd(float velocity, boolean fling) {
if (mAppsView == null) {
return; // early termination.
}
@@ -229,7 +231,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
*/
public void preparePull(boolean start) {
if (start) {
// Initialize values that should not change until #onScrollEnd
// Initialize values that should not change until #onDragEnd
mStatusBarHeight = mLauncher.getDragLayer().getInsets().top;
mHotseat.setVisibility(View.VISIBLE);
mHotseat.bringToFront();
@@ -321,7 +323,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
if (animationOut == null){
return;
}
if (mDetector.isRestingState()) {
if (mDetector.isIdleState()) {
preparePull(true);
mAnimationDuration = duration;
mShiftStart = mAppsView.getTranslationY();
@@ -361,7 +363,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
if (animationOut == null){
return;
}
if(mDetector.isRestingState()) {
if(mDetector.isIdleState()) {
preparePull(true);
mAnimationDuration = duration;
mShiftStart = mAppsView.getTranslationY();