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

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

Merge "Better diags and a small correction for scrolling in AllApps" into ub-launcher3-master

parents 163d4d01 9675452c

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

+2 −2
Original line number Diff line number Diff line
@@ -126,11 +126,11 @@ public class TestInformationHandler implements ResourceBasedOverride { 


            case TestProtocol.REQUEST_APPS_LIST_SCROLL_Y: {

                try {

                    final int deferUpdatesFlags = MAIN_EXECUTOR.submit(() ->

                    final int scroll = MAIN_EXECUTOR.submit(() ->

                            mLauncher.getAppsView().getActiveRecyclerView().getCurrentScrollY())

                            .get();

                    response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD,

                            deferUpdatesFlags);

                            scroll);

                } catch (ExecutionException | InterruptedException e) {

                    throw new RuntimeException(e);

                }

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

+3 −0
Original line number Diff line number Diff line
@@ -131,6 +131,9 @@ public class AllApps extends LauncherInstrumentation.VisibleContainer { 
                                searchBox.getVisibleBounds().bottom

                                        - allAppsContainer.getVisibleBounds().top);

                        final int newScroll = getAllAppsScroll();

                        mLauncher.assertTrue(

                                "Scrolled in a wrong direction in AllApps: from " + scroll + " to "

                                        + newScroll, newScroll >= scroll);

                        if (newScroll == scroll) break;



                        mLauncher.assertTrue(