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

Commit ff672bc4 authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Fix toolbar announce wrong text." into tm-qpr-dev am: 3292a30a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19632605



Change-Id: If97f639c018bec3bcdb7e66b4e0d6b5b0848eadd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 77e5530a 3292a30a

core/java/android/service/selectiontoolbar/RemoteSelectionToolbar.java

+0 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,6 @@ final class RemoteSelectionToolbar { 
        contentContainer.setLayoutParams(new ViewGroup.LayoutParams(

                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));

        contentContainer.setTag(FloatingToolbar.FLOATING_TOOLBAR_TAG);

        contentContainer.setContentDescription(FloatingToolbar.FLOATING_TOOLBAR_TAG);

        contentContainer.setClipToOutline(true);

        return contentContainer;

    }

core/java/com/android/internal/widget/floatingtoolbar/LocalFloatingToolbarPopup.java

+0 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,6 @@ public final class LocalFloatingToolbarPopup implements FloatingToolbarPopup { 
        contentContainer.setLayoutParams(new ViewGroup.LayoutParams(

                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));

        contentContainer.setTag(FloatingToolbar.FLOATING_TOOLBAR_TAG);

        contentContainer.setContentDescription(FloatingToolbar.FLOATING_TOOLBAR_TAG);

        contentContainer.setClipToOutline(true);

        return contentContainer;

    }

core/res/res/layout/floating_popup_container.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
*/

-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/floating_popup_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:padding="0dp"

core/tests/coretests/src/android/widget/FloatingToolbarUtils.java

+12 −11
Original line number Diff line number Diff line
@@ -16,13 +16,12 @@ 


package android.widget;



import static com.android.internal.widget.floatingtoolbar.FloatingToolbar.FLOATING_TOOLBAR_TAG;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertWithMessage;



import android.content.res.Resources;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.BySelector;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.Until;
@@ -33,25 +32,27 @@ import com.android.internal.R; 
final class FloatingToolbarUtils {



    private final UiDevice mDevice;

    private static final BySelector TOOLBAR_CONTAINER_SELECTOR =

            By.res("android", "floating_popup_container");



    FloatingToolbarUtils() {

        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());

    }



    void waitForFloatingToolbarPopup() {

        mDevice.wait(Until.findObject(By.desc(FLOATING_TOOLBAR_TAG)), 500);

        mDevice.wait(Until.findObject(TOOLBAR_CONTAINER_SELECTOR), 500);

    }



    void assertFloatingToolbarIsDisplayed() {

        waitForFloatingToolbarPopup();

        assertThat(mDevice.hasObject(By.desc(FLOATING_TOOLBAR_TAG))).isTrue();

        assertThat(mDevice.hasObject(TOOLBAR_CONTAINER_SELECTOR)).isTrue();

    }



    void assertFloatingToolbarContainsItem(String itemLabel) {

        waitForFloatingToolbarPopup();

        assertWithMessage("Expected to find item labelled [" + itemLabel + "]")

                .that(mDevice.hasObject(

                        By.desc(FLOATING_TOOLBAR_TAG).hasDescendant(By.text(itemLabel))))

                        TOOLBAR_CONTAINER_SELECTOR.hasDescendant(By.text(itemLabel))))

                .isTrue();

    }
@@ -59,14 +60,14 @@ final class FloatingToolbarUtils { 
        waitForFloatingToolbarPopup();

        assertWithMessage("Expected to not find item labelled [" + itemLabel + "]")

                .that(mDevice.hasObject(

                        By.desc(FLOATING_TOOLBAR_TAG).hasDescendant(By.text(itemLabel))))

                        TOOLBAR_CONTAINER_SELECTOR.hasDescendant(By.text(itemLabel))))

                .isFalse();

    }



    void assertFloatingToolbarContainsItemAtIndex(String itemLabel, int index) {

        waitForFloatingToolbarPopup();

        assertWithMessage("Expected to find item labelled [" + itemLabel + "] at index " + index)

                .that(mDevice.findObject(By.desc(FLOATING_TOOLBAR_TAG))

                .that(mDevice.findObject(TOOLBAR_CONTAINER_SELECTOR)

                        .findObjects(By.clickable(true))

                        .get(index)

                        .getChildren()
@@ -77,7 +78,7 @@ final class FloatingToolbarUtils { 


    void clickFloatingToolbarItem(String label) {

        waitForFloatingToolbarPopup();

        mDevice.findObject(By.desc(FLOATING_TOOLBAR_TAG))

        mDevice.findObject(TOOLBAR_CONTAINER_SELECTOR)

                .findObject(By.text(label))

                .click();

    }
@@ -85,13 +86,13 @@ final class FloatingToolbarUtils { 
    void clickFloatingToolbarOverflowItem(String label) {

        // TODO: There might be a benefit to combining this with "clickFloatingToolbarItem" method.

        waitForFloatingToolbarPopup();

        mDevice.findObject(By.desc(FLOATING_TOOLBAR_TAG))

        mDevice.findObject(TOOLBAR_CONTAINER_SELECTOR)

                .findObject(By.desc(str(R.string.floating_toolbar_open_overflow_description)))

                .click();

        mDevice.wait(

                Until.findObject(By.desc(FLOATING_TOOLBAR_TAG).hasDescendant(By.text(label))),

                Until.findObject(TOOLBAR_CONTAINER_SELECTOR.hasDescendant(By.text(label))),

                1000);

        mDevice.findObject(By.desc(FLOATING_TOOLBAR_TAG))

        mDevice.findObject(TOOLBAR_CONTAINER_SELECTOR)

                .findObject(By.text(label))

                .click();

    }