mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 11:18:21 +00:00
Merge "Remove extraneous transition from Overview to Home screen" into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
dbd47e9f75
@@ -119,9 +119,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
|
||||
protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
|
||||
if (fromState == NORMAL && mDidTouchStartInNavBar) {
|
||||
return HINT_STATE;
|
||||
} else if (fromState == OVERVIEW && isDragTowardPositive) {
|
||||
// Don't allow swiping up to all apps.
|
||||
return OVERVIEW;
|
||||
}
|
||||
return super.getTargetState(fromState, isDragTowardPositive);
|
||||
}
|
||||
|
||||
@@ -96,8 +96,6 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
|
||||
return FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get()
|
||||
? mLauncher.getStateManager().getLastState()
|
||||
: NORMAL;
|
||||
} else if (fromState == OVERVIEW) {
|
||||
return isDragTowardPositive ? OVERVIEW : NORMAL;
|
||||
} else if (fromState == NORMAL && isDragTowardPositive) {
|
||||
return ALL_APPS;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user