Merge "Fix splitscreen test: SnapToDismiss" into tm-qpr-dev am: 6cc66e4581
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20348773 Change-Id: I580ac414e3b89ba7079e6510fca6b9b45dffb63e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -140,7 +140,7 @@ public class SplitLayoutTests extends ShellTestCase {
|
|||||||
DividerSnapAlgorithm.SnapTarget snapTarget = getSnapTarget(0 /* position */,
|
DividerSnapAlgorithm.SnapTarget snapTarget = getSnapTarget(0 /* position */,
|
||||||
DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_START);
|
DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_START);
|
||||||
|
|
||||||
mSplitLayout.snapToTarget(0 /* currentPosition */, snapTarget);
|
mSplitLayout.snapToTarget(mSplitLayout.getDividePosition(), snapTarget);
|
||||||
waitDividerFlingFinished();
|
waitDividerFlingFinished();
|
||||||
verify(mSplitLayoutHandler).onSnappedToDismiss(eq(false), anyInt());
|
verify(mSplitLayoutHandler).onSnappedToDismiss(eq(false), anyInt());
|
||||||
}
|
}
|
||||||
@@ -152,7 +152,7 @@ public class SplitLayoutTests extends ShellTestCase {
|
|||||||
DividerSnapAlgorithm.SnapTarget snapTarget = getSnapTarget(0 /* position */,
|
DividerSnapAlgorithm.SnapTarget snapTarget = getSnapTarget(0 /* position */,
|
||||||
DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_END);
|
DividerSnapAlgorithm.SnapTarget.FLAG_DISMISS_END);
|
||||||
|
|
||||||
mSplitLayout.snapToTarget(0 /* currentPosition */, snapTarget);
|
mSplitLayout.snapToTarget(mSplitLayout.getDividePosition(), snapTarget);
|
||||||
waitDividerFlingFinished();
|
waitDividerFlingFinished();
|
||||||
verify(mSplitLayoutHandler).onSnappedToDismiss(eq(true), anyInt());
|
verify(mSplitLayoutHandler).onSnappedToDismiss(eq(true), anyInt());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user