Merge "Revert "Swipe-up from the bar area on the home screen should pull up overview""

This commit is contained in:
Tracy Zhou
2023-01-25 07:59:10 +00:00
committed by Android (Google) Code Review

View File

@@ -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