summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-10-01 17:33:27 -0700
committerAdam Cohen <adamcohen@google.com>2013-10-01 17:35:43 -0700
commitedaaa3023251eb2bd71e3da180df39334f77d4a8 (patch)
tree4e459b8e2cf7b3af75953d951ad9c57fb7316970 /src
parent7f331b6bed657334df6a0372f548d951f42067af (diff)
downloadandroid_packages_apps_Trebuchet-edaaa3023251eb2bd71e3da180df39334f77d4a8.tar.gz
android_packages_apps_Trebuchet-edaaa3023251eb2bd71e3da180df39334f77d4a8.tar.bz2
android_packages_apps_Trebuchet-edaaa3023251eb2bd71e3da180df39334f77d4a8.zip
Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)
Change-Id: I16f4f6a19cdc92af6b817a658dc32e082f08660c
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java3
-rw-r--r--src/com/android/launcher3/Workspace.java18
2 files changed, 15 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 831637ffa..a9cb77140 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -911,6 +911,7 @@ public class Launcher extends Activity
if (DEBUG_RESUME_TIME) {
Log.d(TAG, "Time spent in onResume: " + (System.currentTimeMillis() - startTime));
}
+ mWorkspace.updateInteractionForState();
}
@Override
@@ -3072,7 +3073,6 @@ public class Launcher extends Activity
.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
onWorkspaceShown(animated);
- onInteractionEnd();
}
public void onWorkspaceShown(boolean animated) {
@@ -3087,7 +3087,6 @@ public class Launcher extends Activity
// Change the state *after* we've called all the transition code
mState = State.APPS_CUSTOMIZE;
- onInteractionBegin();
// Pause the auto-advance of widgets until we are out of AllApps
mUserPresent = false;
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index ea348ef8a..02d4fff7b 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1780,19 +1780,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) {
@@ -1835,6 +1832,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;
@@ -1850,7 +1860,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);