Use max of corners when deciding gestures and add logs for corners
Bug: 197326121
Test: Pre/postsubmit
Change-Id: I1c083dc9234354f66cf1537f0cfe8c21f1e1be3b
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index e3f35e1..98d081b 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1561,6 +1561,7 @@
float getWindowCornerRadius() {
final Resources resources = getResources();
if (!supportsRoundedCornersOnWindows(resources)) {
+ Log.d(TAG, "No rounded corners");
return 0f;
}
@@ -1579,7 +1580,8 @@
// Always use the smallest radius to make sure the rounded corners will
// completely cover the display.
- return Math.min(topRadius, bottomRadius);
+ Log.d(TAG, "Rounded corners top: " + topRadius + " bottom: " + bottomRadius);
+ return Math.max(topRadius, bottomRadius);
}
private static boolean supportsRoundedCornersOnWindows(Resources resources) {
diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java
index db2e250..288c853 100644
--- a/tests/tapl/com/android/launcher3/tapl/Workspace.java
+++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java
@@ -83,9 +83,9 @@
+ mLauncher.getTouchSlop());
mLauncher.swipeToState(
- 0,
+ windowCornerRadius,
startY,
- 0,
+ windowCornerRadius,
startY - swipeHeight - mLauncher.getTouchSlop(),
12,
ALL_APPS_STATE_ORDINAL, LauncherInstrumentation.GestureScope.INSIDE);