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

Commit f0c80528 authored by vadimt's avatar vadimt
Browse files

Starting swipe-to-all-apps outside of areas triggering long-press 

I suspect that some tests using TAPL run under pressure (mem or CPU,
created either intentionally or as a result of a leak somewhere)
where test process may generate a pause between DOWN and MOVE events
enough to be recognized as a long tap, which opens a context menu
instead of swiping.

While the clean solution is b/140252325, this is a workaround.

Bug: 144853809
Change-Id: I135eaee608270b7e60bb072cb360632763cbe5c5
parent a11ff18d

src/com/android/launcher3/ResourceUtils.java

+12 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class ResourceUtils { 
        return getDimenByName(resName, res, 48);

    }



    private static int getDimenByName(String resName, Resources res, int defaultValue) {

    public static int getDimenByName(String resName, Resources res, int defaultValue) {

        final int frameSize;

        final int frameSizeResID = res.getIdentifier(resName, "dimen", "android");

        if (frameSizeResID != 0) {
@@ -40,6 +40,17 @@ public class ResourceUtils { 
        return frameSize;

    }



    public static boolean getBoolByName(String resName, Resources res, boolean defaultValue) {

        final boolean val;

        final int resId = res.getIdentifier(resName, "bool", "android");

        if (resId != 0) {

            val = res.getBoolean(resId);

        } else {

            val = defaultValue;

        }

        return val;

    }



    public static int pxFromDp(float size, DisplayMetrics metrics) {

        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, size, metrics));

    }

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

+38 −10
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.launcher3.testing.TestProtocol.SPRING_LOADED_STATE_ORD 


import static junit.framework.TestCase.assertTrue;



import android.content.res.Resources;

import android.graphics.Point;

import android.graphics.Rect;

import android.os.SystemClock;
@@ -49,6 +50,34 @@ public final class Workspace extends Home { 
        mHotseat = launcher.waitForLauncherObject("hotseat");

    }



    private static boolean supportsRoundedCornersOnWindows(Resources resources) {

        return ResourceUtils.getBoolByName(

                "config_supportsRoundedCornersOnWindows", resources, false);

    }



    private static float getWindowCornerRadius(Resources resources) {

        if (!supportsRoundedCornersOnWindows(resources)) {

            return 0f;

        }



        // Radius that should be used in case top or bottom aren't defined.

        float defaultRadius = ResourceUtils.getDimenByName("rounded_corner_radius", resources, 0);



        float topRadius = ResourceUtils.getDimenByName("rounded_corner_radius_top", resources, 0);

        if (topRadius == 0f) {

            topRadius = defaultRadius;

        }

        float bottomRadius = ResourceUtils.getDimenByName(

                "rounded_corner_radius_bottom", resources, 0);

        if (bottomRadius == 0f) {

            bottomRadius = defaultRadius;

        }



        // Always use the smallest radius to make sure the rounded corners will

        // completely cover the display.

        return Math.min(topRadius, bottomRadius);

    }



    /**

     * Swipes up to All Apps.

     *
@@ -59,13 +88,12 @@ public final class Workspace extends Home { 
        try (LauncherInstrumentation.Closable c =

                     mLauncher.addContextLayer("want to switch from workspace to all apps")) {

            verifyActiveContainer();

            final UiObject2 hotseat = mHotseat;

            final Point start = hotseat.getVisibleCenter();

            int deviceHeight = mLauncher.getDevice().getDisplayHeight();

            int bottomGestureMargin = ResourceUtils.getNavbarSize(

            final int deviceHeight = mLauncher.getDevice().getDisplayHeight();

            final int bottomGestureMargin = ResourceUtils.getNavbarSize(

                    ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, mLauncher.getResources());

            int displayBottom = deviceHeight - bottomGestureMargin;

            start.y = displayBottom - 1;

            final int windowCornerRadius = (int) Math.ceil(getWindowCornerRadius(

                    mLauncher.getResources()));

            final int startY = deviceHeight - Math.max(bottomGestureMargin, windowCornerRadius) - 1;

            final int swipeHeight = mLauncher.getTestInfo(

                    TestProtocol.REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT).

                    getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
@@ -74,10 +102,10 @@ public final class Workspace extends Home { 
                            + mLauncher.getTouchSlop());



            mLauncher.swipeToState(

                    start.x,

                    start.y,

                    start.x,

                    start.y - swipeHeight - mLauncher.getTouchSlop(),

                    0,

                    startY,

                    0,

                    startY - swipeHeight - mLauncher.getTouchSlop(),

                    12,

                    ALL_APPS_STATE_ORDINAL);