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

Commit 758faccc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use windowInsets for bottomGestureSize instead of gestureInsets" into sc-v2-dev

parents f90ad3be e9dbb0d9

src/com/android/launcher3/testing/TestInformationHandler.java

+13 −5
Original line number Diff line number Diff line
@@ -102,14 +102,22 @@ public class TestInformationHandler implements ResourceBasedOverride { 
                        l -> WidgetsFullSheet.getWidgetsView(l).getCurrentScrollY());

            }



            case TestProtocol.REQUEST_TARGET_INSETS: {

                return getUIProperty(Bundle::putParcelable, activity -> {

                    WindowInsets insets = activity.getWindow()

                            .getDecorView().getRootWindowInsets();

                    return Insets.max(

                            insets.getSystemGestureInsets(),

                            insets.getSystemWindowInsets());

                }, this::getCurrentActivity);

            }



            case TestProtocol.REQUEST_WINDOW_INSETS: {

                return getUIProperty(Bundle::putParcelable, a -> {

                    WindowInsets insets = a.getWindow()

                return getUIProperty(Bundle::putParcelable, activity -> {

                    WindowInsets insets = activity.getWindow()

                            .getDecorView().getRootWindowInsets();

                    return Insets.subtract(

                            Insets.max(

                                    insets.getSystemGestureInsets(),

                                    insets.getSystemWindowInsets()),

                            insets.getSystemWindowInsets(),

                            Insets.of(0, 0, 0, mDeviceProfile.nonOverlappingTaskbarInset));

                }, this::getCurrentActivity);

            }

src/com/android/launcher3/testing/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public final class TestProtocol { 
    public static final String REQUEST_APP_LIST_FREEZE_FLAGS = "app-list-freeze-flags";

    public static final String REQUEST_APPS_LIST_SCROLL_Y = "apps-list-scroll-y";

    public static final String REQUEST_WIDGETS_SCROLL_Y = "widgets-scroll-y";

    public static final String REQUEST_TARGET_INSETS = "target-insets";

    public static final String REQUEST_WINDOW_INSETS = "window-insets";

    public static final String REQUEST_PID = "pid";

    public static final String REQUEST_FORCE_GC = "gc";

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

+6 −1
Original line number Diff line number Diff line
@@ -288,6 +288,11 @@ public final class LauncherInstrumentation { 
    }



    Insets getTargetInsets() {

        return getTestInfo(TestProtocol.REQUEST_TARGET_INSETS)

                .getParcelable(TestProtocol.TEST_INFO_RESPONSE_FIELD);

    }



    Insets getWindowInsets() {

        return getTestInfo(TestProtocol.REQUEST_WINDOW_INSETS)

                .getParcelable(TestProtocol.TEST_INFO_RESPONSE_FIELD);

    }
@@ -1133,7 +1138,7 @@ public final class LauncherInstrumentation { 
    }



    int getBottomGestureSize() {

        return Math.max(getTargetInsets().bottom, ResourceUtils.getNavbarSize(

        return Math.max(getWindowInsets().bottom, ResourceUtils.getNavbarSize(

                ResourceUtils.NAVBAR_BOTTOM_GESTURE_SIZE, getResources())) + 1;

    }