summaryrefslogtreecommitdiffstats
path: root/quickstep/src
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2019-07-25 15:14:33 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-25 15:14:33 -0700
commitc37af4325f25603d49131cda021f38f865133843 (patch)
tree39765a60bde143f594625fe95eef06c55d0a6eec /quickstep/src
parenta4b35696c961ffa3f1bb7b8bb1448e8a633af080 (diff)
parent2cccb134a48b7e6277692c3d1a20d1fa507fe7c4 (diff)
downloadandroid_packages_apps_Trebuchet-c37af4325f25603d49131cda021f38f865133843.tar.gz
android_packages_apps_Trebuchet-c37af4325f25603d49131cda021f38f865133843.tar.bz2
android_packages_apps_Trebuchet-c37af4325f25603d49131cda021f38f865133843.zip
Merge "Add several missing swipe logging Enable swipe down to open noti shade from landscape" into ub-launcher3-qt-r1-dev
am: 2cccb134a4 Change-Id: I6fd477dc398e55358a5110a552430eb61c29373d
Diffstat (limited to 'quickstep/src')
-rw-r--r--quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
index f5ba3725d..11a804356 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java
@@ -33,6 +33,9 @@ import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
+import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch;
+import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
import com.android.launcher3.util.TouchController;
import com.android.quickstep.RecentsModel;
import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -132,8 +135,12 @@ public class StatusBarTouchController implements TouchController {
@Override
public final boolean onControllerTouchEvent(MotionEvent ev) {
- if (ev.getAction() == ACTION_UP || ev.getAction() == ACTION_CANCEL) {
+ int action = ev.getAction();
+ if (action == ACTION_UP || action == ACTION_CANCEL) {
dispatchTouchEvent(ev);
+ mLauncher.getUserEventDispatcher().logActionOnContainer(action == ACTION_UP ?
+ Touch.FLING : Touch.SWIPE, Direction.DOWN, ContainerType.WORKSPACE,
+ mLauncher.getWorkspace().getCurrentPage());
setWindowSlippery(false);
return true;
}