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

Merge "Check that PIP is active before setting the PIP exclusion bounds" into sc-dev

Browse Source
This commit is contained in:
Jorge Gil
2021-03-16 00:46:16 +00:00
committed by Android (Google) Code Review
parent 0824a65aa9 b9e67286a0
commit 2363bb8162
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
View File

@@ -73,6 +73,7 @@ public class PipTouchHandler {
// Allow PIP to resize to a slightly bigger state upon touch // Allow PIP to resize to a slightly bigger state upon touch
private boolean mEnableResize; private boolean mEnableResize;
private final Context mContext; private final Context mContext;
private final PipTaskOrganizer mPipTaskOrganizer;
private final PipBoundsAlgorithm mPipBoundsAlgorithm; private final PipBoundsAlgorithm mPipBoundsAlgorithm;
private final @NonNull PipBoundsState mPipBoundsState; private final @NonNull PipBoundsState mPipBoundsState;
private final PipUiEventLogger mPipUiEventLogger; private final PipUiEventLogger mPipUiEventLogger;
@@ -169,6 +170,7 @@ public class PipTouchHandler {
mContext = context; mContext = context;
mMainExecutor = mainExecutor; mMainExecutor = mainExecutor;
mAccessibilityManager = context.getSystemService(AccessibilityManager.class); mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
mPipTaskOrganizer = pipTaskOrganizer;
mPipBoundsAlgorithm = pipBoundsAlgorithm; mPipBoundsAlgorithm = pipBoundsAlgorithm;
mPipBoundsState = pipBoundsState; mPipBoundsState = pipBoundsState;
mMenuController = menuController; mMenuController = menuController;
@@ -982,7 +984,9 @@ public class PipTouchHandler {
void setPipExclusionBoundsChangeListener(Consumer<Rect> pipExclusionBoundsChangeListener) { void setPipExclusionBoundsChangeListener(Consumer<Rect> pipExclusionBoundsChangeListener) {
mPipExclusionBoundsChangeListener = new WeakReference<>(pipExclusionBoundsChangeListener); mPipExclusionBoundsChangeListener = new WeakReference<>(pipExclusionBoundsChangeListener);
pipExclusionBoundsChangeListener.accept(mPipBoundsState.getBounds()); pipExclusionBoundsChangeListener.accept(mPipTaskOrganizer.isInPip()
? mPipBoundsState.getBounds() : new Rect());
} }
/** /**