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

AllAppsTransitionController always use LauncherStateTransitionAnimation

Browse Source 
b/30375760

Change-Id: Iee2f8060e4d272d276ddd5d40b4bc6053e8c7778
This commit is contained in:
Hyunyoung Song
2016-07-27 10:55:51 -07:00
parent 10717bfcae
commit 9dcf0a3ef7
4 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
if (mDetector.isSettlingState() && (isInDisallowRecatchBottomZone() || isInDisallowRecatchTopZone())) {
return false;
}
return mDetector.shouldIntercept();
return mDetector.isDraggingOrSettling();
}
private boolean shouldPossiblyIntercept(MotionEvent ev) {
@@ -222,27 +222,17 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
LauncherLogProto.Action.FLING,
LauncherLogProto.Action.UP,
LauncherLogProto.HOTSEAT);
mLauncher.showAppsView(true, true, false, false);
} else {
animateToAllApps(mCurrentAnimation, mAnimationDuration, true);
}
mLauncher.showAppsView(true, true, false, false);
} else {
calculateDuration(velocity, Math.abs(mShiftRange - mAppsView.getTranslationY()));
if (mLauncher.isAllAppsVisible()) {
mLauncher.showWorkspace(true);
} else {
animateToWorkspace(mCurrentAnimation, mAnimationDuration, true);
}
mLauncher.showWorkspace(true);
}
// snap to top or bottom using the release velocity
} else {
if (mAppsView.getTranslationY() > mShiftRange / 2) {
calculateDuration(velocity, Math.abs(mShiftRange - mAppsView.getTranslationY()));
if (mLauncher.isAllAppsVisible()) {
mLauncher.showWorkspace(true);
} else {
animateToWorkspace(mCurrentAnimation, mAnimationDuration, true);
}
mLauncher.showWorkspace(true);
} else {
calculateDuration(velocity, Math.abs(mAppsView.getTranslationY()));
if (!mLauncher.isAllAppsVisible()) {
@@ -250,15 +240,15 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
LauncherLogProto.Action.SWIPE,
LauncherLogProto.Action.UP,
LauncherLogProto.HOTSEAT);
mLauncher.showAppsView(true, true, false, false);
} else {
animateToAllApps(mCurrentAnimation, mAnimationDuration, true);
}
mLauncher.showAppsView(true, true, false, false);
}
}
}
public boolean isTransitioning() {
return mDetector.isDraggingOrSettling();
}
/**
* @param start {@code true} if start of new drag.
*/
@@ -354,7 +344,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
}
public void animateToAllApps(AnimatorSet animationOut, long duration, boolean start) {
public void animateToAllApps(AnimatorSet animationOut, long duration) {
if (animationOut == null) {
return;
}
@@ -390,9 +380,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
});
mCurrentAnimation = animationOut;
if (start) {
mCurrentAnimation.start();
}
}
public void showDiscoveryBounce() {
@@ -425,7 +412,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
});
}
public void animateToWorkspace(AnimatorSet animationOut, long duration, boolean start) {
public void animateToWorkspace(AnimatorSet animationOut, long duration) {
if (animationOut == null) {
return;
}
@@ -462,9 +449,6 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
}
});
mCurrentAnimation = animationOut;
if (start) {
mCurrentAnimation.start();
}
}
public void finishPullUp() {