summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
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/com/android/launcher3/Launcher.java
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/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java3
1 files changed, 1 insertions, 2 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;