Snap for 7706110 from 725ad3c031 to sc-v2-release

Change-Id: Id9c8eed67a8cb96b49c5467cb3772976e4038c31

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

@@ -1561,6 +1561,7 @@ public final class LauncherInstrumentation {
     float getWindowCornerRadius() {
         final Resources resources = getResources();
         if (!supportsRoundedCornersOnWindows(resources)) {
+            Log.d(TAG, "No rounded corners");
             return 0f;
         }
 
@@ -1579,7 +1580,8 @@ public final class LauncherInstrumentation {
 
         // 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) {

tests/tapl/com/android/launcher3/tapl/Workspace.java

@@ -83,9 +83,9 @@ public final class Workspace extends Home {
                             + mLauncher.getTouchSlop());
 
             mLauncher.swipeToState(
-                    0,
+                    windowCornerRadius,
                     startY,
-                    0,
+                    windowCornerRadius,
                     startY - swipeHeight - mLauncher.getTouchSlop(),
                     12,
                     ALL_APPS_STATE_ORDINAL, LauncherInstrumentation.GestureScope.INSIDE);