diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index c041201e81..b9390b854b 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java @@ -233,15 +233,10 @@ public class RotationTouchHelper implements DisplayInfoChangeListener { * @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 class RotationTouchHelper implements DisplayInfoChangeListener { */ 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