Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725ad3c0 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Use max of corners when deciding gestures and add logs for corners" into sc-v2-dev

parents 28325b07 b4226586

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

+3 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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);