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

Merge "Fix hard dragging from the edge of the screen" into sc-dev

Browse Source
This commit is contained in:
Ryan Lin
2021-06-09 01:04:32 +00:00
committed by Android (Google) Code Review
parent 5a456fffa3 636678a348
commit 81cd3a475c
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
View File

@@ -66,6 +66,7 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.NumberFormat; import java.text.NumberFormat;
import java.util.Collections;
import java.util.Locale; import java.util.Locale;
/** /**
@@ -178,7 +179,13 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
// Initialize listeners. // Initialize listeners.
mMirrorViewRunnable = () -> { mMirrorViewRunnable = () -> {
if (mMirrorView != null) { if (mMirrorView != null) {
final Rect oldViewBounds = new Rect(mMirrorViewBounds);
mMirrorView.getBoundsOnScreen(mMirrorViewBounds); mMirrorView.getBoundsOnScreen(mMirrorViewBounds);
if (oldViewBounds.width() != mMirrorViewBounds.width()
|| oldViewBounds.height() != mMirrorViewBounds.height()) {
mMirrorView.setSystemGestureExclusionRects(Collections.singletonList(
new Rect(0, 0, mMirrorViewBounds.width(), mMirrorViewBounds.height())));
}
updateSystemUIStateIfNeeded(); updateSystemUIStateIfNeeded();
mWindowMagnifierCallback.onWindowMagnifierBoundsChanged( mWindowMagnifierCallback.onWindowMagnifierBoundsChanged(
mDisplayId, mMirrorViewBounds); mDisplayId, mMirrorViewBounds);
@@ -269,6 +276,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
if (mMirrorWindowControl != null) { if (mMirrorWindowControl != null) {
mMirrorWindowControl.destroyControl(); mMirrorWindowControl.destroyControl();
} }
mMirrorViewBounds.setEmpty();
updateSystemUIStateIfNeeded(); updateSystemUIStateIfNeeded();
} }

15
packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
View File

@@ -77,6 +77,8 @@ import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import java.util.List;
@LargeTest @LargeTest
@RunWith(AndroidTestingRunner.class) @RunWith(AndroidTestingRunner.class)
public class WindowMagnificationControllerTest extends SysuiTestCase { public class WindowMagnificationControllerTest extends SysuiTestCase {
@@ -151,6 +153,19 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
eq(mContext.getDisplayId()), any(Rect.class)); eq(mContext.getDisplayId()), any(Rect.class));
} }
@Test
public void enableWindowMagnification_systemGestureExclusionRectsIsSet() {
mInstrumentation.runOnMainSync(() -> {
mWindowMagnificationController.enableWindowMagnification(Float.NaN, Float.NaN,
Float.NaN);
});
// Wait for Rects updated.
waitForIdleSync();
List<Rect> rects = mWindowManager.getAttachedView().getSystemGestureExclusionRects();
assertFalse(rects.isEmpty());
}
@Test @Test
public void deleteWindowMagnification_destroyControl() { public void deleteWindowMagnification_destroyControl() {
mInstrumentation.runOnMainSync(() -> { mInstrumentation.runOnMainSync(() -> {