aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 10:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose

Browse Source
This commit is contained in:
Adam Cohen
2013-10-02 01:03:54 +00:00
committed by Android (Google) Code Review
parent ba4e52f41c edaaa30232
commit 20df4f87ec
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/Workspace.java
View File

@@ -1779,19 +1779,16 @@ public class Workspace extends SmoothPagedView
if (mTouchState != TOUCH_STATE_REST) {
return false;
}
mLauncher.onInteractionBegin();
enableOverviewMode(true, -1, true);
return true;
}
public void exitOverviewMode(boolean animated) {
exitOverviewMode(-1, animated);
mLauncher.onInteractionEnd();
}
public void exitOverviewMode(int snapPage, boolean animated) {
enableOverviewMode(false, snapPage, animated);
mLauncher.onInteractionEnd();
}
private void enableOverviewMode(boolean enable, int snapPage, boolean animated) {
@@ -1834,6 +1831,19 @@ public class Workspace extends SmoothPagedView
return true;
}
public void updateInteractionForState() {
if (mState != State.NORMAL) {
mLauncher.onInteractionBegin();
} else {
mLauncher.onInteractionEnd();
}
}
private void setState(State state) {
mState = state;
updateInteractionForState();
}
Animator getChangeStateAnimation(final State state, boolean animated, int delay, int snapPage) {
if (mState == state) {
return null;
@@ -1849,7 +1859,7 @@ public class Workspace extends SmoothPagedView
final boolean oldStateIsSpringLoaded = (oldState == State.SPRING_LOADED);
final boolean oldStateIsSmall = (oldState == State.SMALL);
final boolean oldStateIsOverview = (oldState == State.OVERVIEW);
mState = state;
setState(state);
final boolean stateIsNormal = (state == State.NORMAL);
final boolean stateIsSpringLoaded = (state == State.SPRING_LOADED);
final boolean stateIsSmall = (state == State.SMALL);