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

Merge "Fix RuntimeException in GestureDetector for Letterbox." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-20 21:47:25 +00:00
committed by Android (Google) Code Review
parent d21de41100 472a79e4d7
commit 8ad71b1731
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/Letterbox.java
View File

@@ -247,7 +247,8 @@ public class Letterbox {
TapEventReceiver(InputChannel inputChannel, Context context) { TapEventReceiver(InputChannel inputChannel, Context context) {
super(inputChannel, UiThread.getHandler().getLooper()); super(inputChannel, UiThread.getHandler().getLooper());
mDoubleTapListener = new DoubleTapListener(); mDoubleTapListener = new DoubleTapListener();
mDoubleTapDetector = new GestureDetector(context, mDoubleTapListener); mDoubleTapDetector = new GestureDetector(
context, mDoubleTapListener, UiThread.getHandler());
} }
@Override @Override

4
services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java
View File

@@ -1171,7 +1171,6 @@ public class SizeCompatTests extends WindowTestsBase {
final WindowState w = addWindowToActivity(mActivity); final WindowState w = addWindowToActivity(mActivity);
// Compute the frames of the window and invoke {@link ActivityRecord#layoutLetterbox}. // Compute the frames of the window and invoke {@link ActivityRecord#layoutLetterbox}.
mActivity.mRootWindowContainer.performSurfacePlacement(); mActivity.mRootWindowContainer.performSurfacePlacement();
mActivity.layoutLetterbox(null);
// The letterbox insets should be [450, 0 - 250, 0]. // The letterbox insets should be [450, 0 - 250, 0].
assertEquals(new Rect(mActivity.getBounds().left, 0, dh - mActivity.getBounds().right, 0), assertEquals(new Rect(mActivity.getBounds().left, 0, dh - mActivity.getBounds().right, 0),
mActivity.getLetterboxInsets()); mActivity.getLetterboxInsets());
@@ -1833,9 +1832,6 @@ public class SizeCompatTests extends WindowTestsBase {
} }
private void assertLetterboxSurfacesDrawnBetweenActivityAndParentBounds(Rect parentBounds) { private void assertLetterboxSurfacesDrawnBetweenActivityAndParentBounds(Rect parentBounds) {
// Ensure Letterbox is updated.
mActivity.layoutLetterbox(null);
// Letterbox should fill the gap between the parent bounds and the letterboxed activity. // Letterbox should fill the gap between the parent bounds and the letterboxed activity.
final Rect letterboxedBounds = new Rect(mActivity.getBounds()); final Rect letterboxedBounds = new Rect(mActivity.getBounds());
assertTrue(parentBounds.contains(letterboxedBounds)); assertTrue(parentBounds.contains(letterboxedBounds));