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

Commit fb7b4a5b authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed ActivityChooser logic for the initial case. 

When ActionSendMultipleConsumerActivity is not the default action, it
just need to be selected, without clicking 'Just Once'

BUG: 25752530
Change-Id: I111063aa0dbba37e0cac8f0572f43a48c659e975
parent e2b4f497

packages/Shell/tests/src/com/android/shell/UiBot.java

+10 −11
Original line number Diff line number Diff line
@@ -124,6 +124,16 @@ final class UiBot { 


        if (gotIt) {

            Log.v(TAG, "Found activity " + name + ", it's the default action");

            // Clicks the "Just Once" button.

            gotIt = mDevice

                    .wait(Until.hasObject(By.res("android", "button_once")), mTimeout);

            assertTrue("'Just Once' button not visible yet", gotIt);



            UiObject justOnce = mDevice

                    .findObject(new UiSelector().resourceId("android:id/button_once"));

            assertTrue("'Just Once' button not found", justOnce.exists());



            click(justOnce, "Just Once");

        } else {

            // Since it's not, need to find it in the scrollable list...

            Log.v(TAG, "Activity " + name + " is not default action");
@@ -140,16 +150,5 @@ final class UiBot { 
            // ... then select it.

            click(activity, name);

        }



        // Then clicks the "Just Once" button.

        gotIt = mDevice

                .wait(Until.hasObject(By.res("android", "button_once")), mTimeout);

        assertTrue("'Just Once' button not visible yet", gotIt);



        UiObject justOnce = mDevice

                .findObject(new UiSelector().resourceId("android:id/button_once"));

        assertTrue("'Just Once' button not found", justOnce.exists());



        click(justOnce, "Just Once");

    }

}