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

Merge "Fix hit targets, hopefully once and for all"

Browse Source
This commit is contained in:
Mady Mellor
2022-01-28 23:29:41 +00:00
committed by Android (Google) Code Review
parent 437245c6ef 7a772305c3
commit 6c30a027ea
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropPolicy.java
View File

@@ -150,43 +150,45 @@ public class DragAndDropPolicy {
if (inLandscape) {
final Rect leftHitRegion = new Rect();
final Rect leftDrawRegion = topOrLeftBounds;
final Rect rightHitRegion = new Rect();
final Rect rightDrawRegion = bottomOrRightBounds;
// If we have existing split regions use those bounds, otherwise split it 50/50
if (inSplitScreen) {
// Add the divider bounds to each side since that counts for the hit region.
leftHitRegion.set(topOrLeftBounds);
leftHitRegion.right += dividerWidth / 2;
rightHitRegion.set(bottomOrRightBounds);
rightHitRegion.left -= dividerWidth / 2;
// The bounds of the existing split will have a divider bar, the hit region
// should include that space. Find the center of the divider bar:
float centerX = topOrLeftBounds.right + (dividerWidth / 2);
// Now set the hit regions using that center.
leftHitRegion.set(displayRegion);
leftHitRegion.right = (int) centerX;
rightHitRegion.set(displayRegion);
rightHitRegion.left = (int) centerX;
} else {
displayRegion.splitVertically(leftHitRegion, rightHitRegion);
}
mTargets.add(new Target(TYPE_SPLIT_LEFT, leftHitRegion, leftDrawRegion));
mTargets.add(new Target(TYPE_SPLIT_RIGHT, rightHitRegion, rightDrawRegion));
mTargets.add(new Target(TYPE_SPLIT_LEFT, leftHitRegion, topOrLeftBounds));
mTargets.add(new Target(TYPE_SPLIT_RIGHT, rightHitRegion, bottomOrRightBounds));
} else {
final Rect topHitRegion = new Rect();
final Rect topDrawRegion = topOrLeftBounds;
final Rect bottomHitRegion = new Rect();
final Rect bottomDrawRegion = bottomOrRightBounds;
// If we have existing split regions use those bounds, otherwise split it 50/50
if (inSplitScreen) {
// Add the divider bounds to each side since that counts for the hit region.
topHitRegion.set(topOrLeftBounds);
topHitRegion.bottom += dividerWidth / 2;
bottomHitRegion.set(bottomOrRightBounds);
bottomHitRegion.top -= dividerWidth / 2;
// The bounds of the existing split will have a divider bar, the hit region
// should include that space. Find the center of the divider bar:
float centerX = topOrLeftBounds.bottom + (dividerWidth / 2);
// Now set the hit regions using that center.
topHitRegion.set(displayRegion);
topHitRegion.bottom = (int) centerX;
bottomHitRegion.set(displayRegion);
bottomHitRegion.top = (int) centerX;
} else {
displayRegion.splitHorizontally(topHitRegion, bottomHitRegion);
}
mTargets.add(new Target(TYPE_SPLIT_TOP, topHitRegion, topDrawRegion));
mTargets.add(new Target(TYPE_SPLIT_BOTTOM, bottomHitRegion, bottomDrawRegion));
mTargets.add(new Target(TYPE_SPLIT_TOP, topHitRegion, topOrLeftBounds));
mTargets.add(new Target(TYPE_SPLIT_BOTTOM, bottomHitRegion, bottomOrRightBounds));
}
} else {
// Split-screen not allowed, so only show the fullscreen target