Merge "Update the divider touch-region properly" into rvc-dev
This commit is contained in:
@@ -352,8 +352,6 @@ public class DividerView extends FrameLayout implements OnTouchListener,
|
|||||||
minimizeLeft + mMinimizedShadow.getMeasuredWidth(),
|
minimizeLeft + mMinimizedShadow.getMeasuredWidth(),
|
||||||
minimizeTop + mMinimizedShadow.getMeasuredHeight());
|
minimizeTop + mMinimizedShadow.getMeasuredHeight());
|
||||||
if (changed) {
|
if (changed) {
|
||||||
mWindowManagerProxy.setTouchRegion(new Rect(mHandle.getLeft(), mHandle.getTop(),
|
|
||||||
mHandle.getRight(), mHandle.getBottom()));
|
|
||||||
notifySplitScreenBoundsChanged();
|
notifySplitScreenBoundsChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -679,6 +677,14 @@ public class DividerView extends FrameLayout implements OnTouchListener,
|
|||||||
private void notifySplitScreenBoundsChanged() {
|
private void notifySplitScreenBoundsChanged() {
|
||||||
mOtherTaskRect.set(mSplitLayout.mSecondary);
|
mOtherTaskRect.set(mSplitLayout.mSecondary);
|
||||||
|
|
||||||
|
mTmpRect.set(mHandle.getLeft(), mHandle.getTop(), mHandle.getRight(), mHandle.getBottom());
|
||||||
|
if (isHorizontalDivision()) {
|
||||||
|
mTmpRect.offsetTo(0, mDividerPositionY);
|
||||||
|
} else {
|
||||||
|
mTmpRect.offsetTo(mDividerPositionX, 0);
|
||||||
|
}
|
||||||
|
mWindowManagerProxy.setTouchRegion(mTmpRect);
|
||||||
|
|
||||||
mTmpRect.set(mSplitLayout.mDisplayLayout.stableInsets());
|
mTmpRect.set(mSplitLayout.mDisplayLayout.stableInsets());
|
||||||
switch (mSplitLayout.getPrimarySplitSide()) {
|
switch (mSplitLayout.getPrimarySplitSide()) {
|
||||||
case WindowManager.DOCKED_LEFT:
|
case WindowManager.DOCKED_LEFT:
|
||||||
|
|||||||
Reference in New Issue
Block a user