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

Commit 54500c61 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Override Internet Dialog's TalkBack description" into tm-qpr-dev am:... 

Merge "Override Internet Dialog's TalkBack description" into tm-qpr-dev am: 4dc75678 am: f4456873

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



Change-Id: I958da11fb6c22aebd36bc0d130ef0084b3036c38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 624f3aef f4456873

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialog.java

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ public class InternetDialog extends SystemUIDialog implements 
        mUiEventLogger.log(InternetDialogEvent.INTERNET_DIALOG_SHOW);

        mDialogView = LayoutInflater.from(mContext).inflate(R.layout.internet_connectivity_dialog,

                null);

        mDialogView.setAccessibilityPaneTitle(

                mContext.getText(R.string.accessibility_desc_quick_settings));

        final Window window = getWindow();

        window.setContentView(mDialogView);

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDialogTest.java

+6 −0
Original line number Diff line number Diff line
@@ -142,6 +142,12 @@ public class InternetDialogTest extends SysuiTestCase { 
        mMockitoSession.finishMocking();

    }



    @Test

    public void createInternetDialog_setAccessibilityPaneTitleToQuickSettings() {

        assertThat(mDialogView.getAccessibilityPaneTitle())

                .isEqualTo(mContext.getText(R.string.accessibility_desc_quick_settings));

    }



    @Test

    public void hideWifiViews_WifiViewsGone() {

        mInternetDialog.hideWifiViews();