From b44a40442b70649d7d0ddf58a5ed8ccbba0d1fbb Mon Sep 17 00:00:00 2001 From: Jeff Chang Date: Wed, 2 Nov 2022 18:30:02 +0800 Subject: [PATCH] Fix splitscreen test: SnapToDismiss The test cases verify onSnappedToDismiss callbacks properly invoked when the snap target indicates dismissing split. The callback is invoked more than once since the start position is the same as the end position when flingDividePosition is invoked. This CL updates the current position to make sure the callback is invoked once. Bug: 257348773 Test: atest SplitLayoutTests Change-Id: I5742d3db1ab6d5c80c4b4ffa1a9465655c73ab11 --- .../com/android/wm/shell/common/split/SplitLayoutTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java index f6d6c03bc2ee5..5332476d5130a 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/split/SplitLayoutTests.java @@ -140,7 +140,7 @@ public class SplitLayoutTests extends ShellTestCase { DividerSnapAlgorithm.SnapTarget snapTarget = getSnapTarget(0 /* position */, DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_START); - mSplitLayout.snapToTarget(0 /* currentPosition */, snapTarget); + mSplitLayout.snapToTarget(mSplitLayout.getDividePosition(), snapTarget); waitDividerFlingFinished(); verify(mSplitLayoutHandler).onSnappedToDismiss(eq(false), anyInt()); } @@ -152,7 +152,7 @@ public class SplitLayoutTests extends ShellTestCase { DividerSnapAlgorithm.SnapTarget snapTarget = getSnapTarget(0 /* position */, DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_END); - mSplitLayout.snapToTarget(0 /* currentPosition */, snapTarget); + mSplitLayout.snapToTarget(mSplitLayout.getDividePosition(), snapTarget); waitDividerFlingFinished(); verify(mSplitLayoutHandler).onSnappedToDismiss(eq(true), anyInt()); }