Revert "Swipe-up from the bar area on the home screen should pull up overview"
This reverts commit c5985751c433c26f87d2023766a4e164222ddd91.
Reason for revert: Confirmed with Manasi that we don't want to have a different behavior for the trackpad gesture even if it starts from the task bar area. It should be treated the same.
Change-Id: I5817c477968545e452d7600d43825209e2c75c37
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index f75924b..aab5703 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -233,15 +233,10 @@
* @return whether the coordinates of the {@param event} is in the swipe up gesture region.
*/
public boolean isInSwipeUpTouchRegion(MotionEvent event, BaseActivityInterface activity) {
- boolean inBarArea = mOrientationTouchTransformer.touchInValidSwipeRegions(event.getX(),
- event.getY());
- if (inBarArea) {
- return true;
- }
if (isTrackpadMotionEvent(event)) {
return !activity.isResumed();
}
- return false;
+ return mOrientationTouchTransformer.touchInValidSwipeRegions(event.getX(), event.getY());
}
/**
@@ -250,15 +245,11 @@
*/
public boolean isInSwipeUpTouchRegion(MotionEvent event, int pointerIndex,
BaseActivityInterface activity) {
- boolean inBarArea = mOrientationTouchTransformer.touchInValidSwipeRegions(
- event.getX(pointerIndex), event.getY(pointerIndex));
- if (inBarArea) {
- return true;
- }
if (isTrackpadMotionEvent(event)) {
return !activity.isResumed();
}
- return false;
+ return mOrientationTouchTransformer.touchInValidSwipeRegions(event.getX(pointerIndex),
+ event.getY(pointerIndex));
}
@Override