mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-03 17:36:49 +00:00
Merge "Fix quick switch from home biased towards returning home" into ub-launcher3-qt-future-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
75b7b9d35c
@@ -342,9 +342,20 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
|
||||
|
||||
final LauncherState targetState;
|
||||
if (horizontalFling && verticalFling) {
|
||||
// Flinging left and up, left and down, or right and up all go back home.
|
||||
// Only flinging right and down goes to quick switch.
|
||||
targetState = velocity.x < 0 || velocity.y < 0 ? NORMAL : QUICK_SWITCH;
|
||||
if (velocity.x < 0) {
|
||||
// Flinging left and up or down both go back home.
|
||||
targetState = NORMAL;
|
||||
} else {
|
||||
if (velocity.y > 0) {
|
||||
// Flinging right and down goes to quick switch.
|
||||
targetState = QUICK_SWITCH;
|
||||
} else {
|
||||
// Flinging up and right could go either home or to quick switch.
|
||||
// Determine the target based on the higher velocity.
|
||||
targetState = Math.abs(velocity.x) > Math.abs(velocity.y)
|
||||
? QUICK_SWITCH : NORMAL;
|
||||
}
|
||||
}
|
||||
} else if (horizontalFling) {
|
||||
targetState = velocity.x > 0 ? QUICK_SWITCH : NORMAL;
|
||||
} else if (verticalFling) {
|
||||
|
||||
Reference in New Issue
Block a user