Merge "Adding code to open DWP settings of a recent task" into ub-launcher3-master
diff --git a/Android.bp b/Android.bp
index 4b32702..e3dd5e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,8 @@
name: "launcher-aosp-tapl",
static_libs: [
"androidx.annotation_annotation",
- "androidx-test",
+ "androidx.test.runner",
+ "androidx.test.rules",
"androidx.test.uiautomator_uiautomator",
"SystemUISharedLib",
],
diff --git a/quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java
index 35f46cf..8f33e40 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java
@@ -51,7 +51,8 @@
public StatusBarTouchController(Launcher l) {
mLauncher = l;
- mTouchSlop = ViewConfiguration.get(l).getScaledTouchSlop();
+ // Guard against TAPs by increasing the touch slop.
+ mTouchSlop = 2 * ViewConfiguration.get(l).getScaledTouchSlop();
mTranslator = new TouchEventTranslator((MotionEvent ev)-> dispatchTouchEvent(ev));
}
@@ -90,6 +91,9 @@
mTranslator.processMotionEvent(ev);
return true;
}
+ if (Math.abs(dx) > mTouchSlop) {
+ mCanIntercept = false;
+ }
}
return false;
}
diff --git a/tests/Android.mk b/tests/Android.mk
index d808873..a787537 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -21,7 +21,8 @@
include $(CLEAR_VARS)
LOCAL_STATIC_JAVA_LIBRARIES := \
androidx.annotation_annotation \
- androidx-test \
+ androidx.test.runner \
+ androidx.test.rules \
androidx.test.uiautomator_uiautomator \
libSharedSystemUI
@@ -42,7 +43,8 @@
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := \
- androidx-test \
+ androidx.test.runner \
+ androidx.test.rules \
androidx.test.uiautomator_uiautomator \
mockito-target-minus-junit4