Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Apply PIP exclusion region only if in PIP mode" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-14 18:52:24 +00:00
committed by Android (Google) Code Review
parent a262629f88 97f7e3d486
commit 9088f944c2
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java
View File

@@ -147,6 +147,16 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
mPackageName = "_UNKNOWN"; mPackageName = "_UNKNOWN";
} }
} }
@Override
public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {
mIsInPipMode = true;
}
@Override
public void onActivityUnpinned() {
mIsInPipMode = false;
}
}; };
private DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener = private DeviceConfig.OnPropertiesChangedListener mOnPropertiesChangedListener =
@@ -220,6 +230,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
private boolean mIsNavBarShownTransiently; private boolean mIsNavBarShownTransiently;
private boolean mIsBackGestureAllowed; private boolean mIsBackGestureAllowed;
private boolean mGestureBlockingActivityRunning; private boolean mGestureBlockingActivityRunning;
private boolean mIsInPipMode;
private InputMonitor mInputMonitor; private InputMonitor mInputMonitor;
private InputChannelCompat.InputEventReceiver mInputEventReceiver; private InputChannelCompat.InputEventReceiver mInputEventReceiver;
@@ -636,7 +647,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
// If the point is inside the PiP or Nav bar overlay excluded bounds, then ignore the back // If the point is inside the PiP or Nav bar overlay excluded bounds, then ignore the back
// gesture // gesture
if (mPipExcludedBounds.contains(x, y) || mNavBarOverlayExcludedBounds.contains(x, y)) { final boolean isInsidePip = mIsInPipMode && mPipExcludedBounds.contains(x, y);
if (isInsidePip || mNavBarOverlayExcludedBounds.contains(x, y)) {
return false; return false;
} }
@@ -898,6 +910,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker
pw.println(" mInRejectedExclusion" + mInRejectedExclusion); pw.println(" mInRejectedExclusion" + mInRejectedExclusion);
pw.println(" mExcludeRegion=" + mExcludeRegion); pw.println(" mExcludeRegion=" + mExcludeRegion);
pw.println(" mUnrestrictedExcludeRegion=" + mUnrestrictedExcludeRegion); pw.println(" mUnrestrictedExcludeRegion=" + mUnrestrictedExcludeRegion);
pw.println(" mIsInPipMode=" + mIsInPipMode);
pw.println(" mPipExcludedBounds=" + mPipExcludedBounds); pw.println(" mPipExcludedBounds=" + mPipExcludedBounds);
pw.println(" mNavBarOverlayExcludedBounds=" + mNavBarOverlayExcludedBounds); pw.println(" mNavBarOverlayExcludedBounds=" + mNavBarOverlayExcludedBounds);
pw.println(" mEdgeWidthLeft=" + mEdgeWidthLeft); pw.println(" mEdgeWidthLeft=" + mEdgeWidthLeft);