diff options
| author | Mario Bertschler <bmario@google.com> | 2017-05-30 13:53:41 -0700 |
|---|---|---|
| committer | Mario Bertschler <bmario@google.com> | 2017-05-30 13:57:05 -0700 |
| commit | 2518cfc36590c0bf4d650c8650fc0870eef1f4bf (patch) | |
| tree | 0c25160ebce8dbf45b0bbc25eacbedcdeeb39cdb /src/com/android/launcher3/allapps | |
| parent | 0e695fe41f3fa0ed91671b2cf42a7dac246f68a4 (diff) | |
| download | android_packages_apps_Trebuchet-2518cfc36590c0bf4d650c8650fc0870eef1f4bf.tar.gz android_packages_apps_Trebuchet-2518cfc36590c0bf4d650c8650fc0870eef1f4bf.tar.bz2 android_packages_apps_Trebuchet-2518cfc36590c0bf4d650c8650fc0870eef1f4bf.zip | |
Distignuishing between hotseat/workspace on the logging for opening
all apps via swipe/fling.
b/38422894
Change-Id: I84a5fd8df38f70caf887eb0def905756059ccd93
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -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 */, |