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

Commit 6c0b6ca0 authored by Daniel Akinola's avatar Daniel Akinola
Browse files

Fix App header buttons announcing name twice 

There were two versions of the same linearlayout that were a11y
focusable for each app header button, due to how the XML was imported,
so now setting one layer to  not important for accessibility, so only
the clickable layer will be noticed

Fix: 398128081
Test: open app in desktop windowing, open app chip menu, turn on
talkback and try to swipe through button
Flag: EXEMPT bugfix

Change-Id: I6481aa412325ad2917938b91a3f2eae6c0d73c11
parent e2820723

libs/WindowManager/Shell/res/layout/desktop_mode_window_decor_handle_menu.xml

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ 
            android:contentDescription="@string/screenshot_text"

            android:text="@string/screenshot_text"

            android:src="@drawable/desktop_mode_ic_handle_menu_screenshot"

            android:importantForAccessibility="no"

            style="@style/DesktopModeHandleMenuActionButton"/>



        <com.android.wm.shell.windowdecor.HandleMenuActionButton
@@ -152,6 +153,7 @@ 
            android:contentDescription="@string/new_window_text"

            android:text="@string/new_window_text"

            android:src="@drawable/desktop_mode_ic_handle_menu_new_window"

            android:importantForAccessibility="no"

            style="@style/DesktopModeHandleMenuActionButton"/>



        <com.android.wm.shell.windowdecor.HandleMenuActionButton
@@ -159,6 +161,7 @@ 
            android:contentDescription="@string/manage_windows_text"

            android:text="@string/manage_windows_text"

            android:src="@drawable/desktop_mode_ic_handle_menu_manage_windows"

            android:importantForAccessibility="no"

            style="@style/DesktopModeHandleMenuActionButton"/>



        <com.android.wm.shell.windowdecor.HandleMenuActionButton
@@ -166,6 +169,7 @@ 
            android:contentDescription="@string/change_aspect_ratio_text"

            android:text="@string/change_aspect_ratio_text"

            android:src="@drawable/desktop_mode_ic_handle_menu_change_aspect_ratio"

            android:importantForAccessibility="no"

            style="@style/DesktopModeHandleMenuActionButton"/>

    </LinearLayout>
@@ -185,6 +189,7 @@ 
            android:text="@string/open_in_browser_text"

            android:src="@drawable/desktop_mode_ic_handle_menu_open_in_browser"

            style="@style/DesktopModeHandleMenuActionButton"

            android:importantForAccessibility="no"

            android:layout_width="0dp"

            android:layout_weight="1"/>

libs/WindowManager/Shell/res/layout/desktop_mode_window_decor_handle_menu_action_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,10 +29,11 @@ 


    <ImageView

        android:id="@+id/image"

        android:contentDescription="@+id/label"

        android:importantForAccessibility="no"

        style="@style/DesktopModeHandleMenuActionButtonImage"/>



    <com.android.wm.shell.windowdecor.MarqueedTextView

        android:id="@+id/label"

        android:importantForAccessibility="no"

        style="@style/DesktopModeHandleMenuActionButtonTextView"/>

</LinearLayout>