diff options
| author | Mario Bertschler <bmario@google.com> | 2017-05-30 21:45:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-30 21:45:27 +0000 |
| commit | e9257abd749265e5e68e66c55c6556dff07feead (patch) | |
| tree | afcd7082ab66e530ca4d34096056258c91361f49 | |
| parent | fc173c0ed5ba16c503a2cbe49066035a9971a6f7 (diff) | |
| parent | 2518cfc36590c0bf4d650c8650fc0870eef1f4bf (diff) | |
| download | android_packages_apps_Trebuchet-e9257abd749265e5e68e66c55c6556dff07feead.tar.gz android_packages_apps_Trebuchet-e9257abd749265e5e68e66c55c6556dff07feead.tar.bz2 android_packages_apps_Trebuchet-e9257abd749265e5e68e66c55c6556dff07feead.zip | |
Distignuishing between hotseat/workspace on the logging for opening all apps via swipe/fling.
am: 2518cfc365
Change-Id: I7b46d4515ca253e1186895a81df62683b773d63b
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 77bc8cbda..ba20135be 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -93,6 +93,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul private AnimatorSet mCurrentAnimation; private boolean mNoIntercept; + private boolean mTouchEventStartedOnHotseat; // Used in discovery bounce animation to provide the transition without workspace changing. private boolean mIsTranslateWithoutWorkspace = false; @@ -118,6 +119,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul public boolean onControllerInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { mNoIntercept = false; + mTouchEventStartedOnHotseat = mLauncher.getDragLayer().isEventOverHotseat(ev); if (!mLauncher.isAllAppsVisible() && mLauncher.getWorkspace().workspaceInModalState()) { mNoIntercept = true; } else if (mLauncher.isAllAppsVisible() && @@ -210,6 +212,9 @@ public class AllAppsTransitionController implements TouchController, VerticalPul return; // early termination. } + final int containerType = mTouchEventStartedOnHotseat + ? ContainerType.HOTSEAT : ContainerType.WORKSPACE; + if (fling) { if (velocity < 0) { calculateDuration(velocity, mAppsView.getTranslationY()); @@ -218,7 +223,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mLauncher.getUserEventDispatcher().logActionOnContainer( Action.Touch.FLING, Action.Direction.UP, - ContainerType.HOTSEAT); + containerType); } mLauncher.showAppsView(true /* animated */, false /* updatePredictedApps */, @@ -241,7 +246,7 @@ public class AllAppsTransitionController implements TouchController, VerticalPul mLauncher.getUserEventDispatcher().logActionOnContainer( Action.Touch.SWIPE, Action.Direction.UP, - ContainerType.HOTSEAT); + containerType); } mLauncher.showAppsView(true, /* animated */ false /* updatePredictedApps */, |