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

Commit a9ae5e6b authored by Jorge Gil's avatar Jorge Gil
Browse files

Improve window decoration a11y 

- Marks unnecessary views as not important for accessibility so that
  they're not announced with Talkback or focused with other a11y
  services (e.g. the app chip should be a single button, not two; the
  icon in the Handle Menu doesn't need to be focusable)
- Removes duplicate Maximize Menu focusable views
- Focuses a11y service on the first view of the Handle and Maximize menu
  after opening them
- Focuses a11y service back on the app chip or maximize menu when their
  respective menu is closed
- Adds missing labels to Maximize Menu's buttons

Fix: 329373346
Fix: 329370431
Fix: 329370508
Fix: 329364244
Fix: 329210454
Fix: 329208268
Fix: 329199667
Fix: 329195839
Flag: EXEMPT bugfix
Test: enable a11y, test scenarios in description
Change-Id: I17540a988b469c912512735da47ccabf4cef1df5
parent 7a9c9eec

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
        android:layout_height="@dimen/desktop_mode_fullscreen_decor_caption_height"

        android:paddingVertical="16dp"

        android:paddingHorizontal="10dp"

        android:screenReaderFocusable="true"

        android:importantForAccessibility="yes"

        android:contentDescription="@string/handle_text"

        android:src="@drawable/decor_handle_dark"

        tools:tint="@color/desktop_mode_caption_handle_bar_dark"

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

+9 −2
Original line number Diff line number Diff line
@@ -31,14 +31,16 @@ 
        android:orientation="horizontal"

        android:clickable="true"

        android:focusable="true"

        android:contentDescription="@string/desktop_mode_app_header_chip_text"

        android:layout_marginStart="12dp">

        <ImageView

            android:id="@+id/application_icon"

            android:layout_width="@dimen/desktop_mode_caption_icon_radius"

            android:layout_height="@dimen/desktop_mode_caption_icon_radius"

            android:layout_gravity="center_vertical"

            android:contentDescription="@string/app_icon_text"

            android:layout_marginStart="6dp"

            android:clickable="false"

            android:focusable="false"

            android:scaleType="centerCrop"/>



        <TextView
@@ -53,18 +55,22 @@ 
            android:layout_gravity="center_vertical"

            android:layout_weight="1"

            android:layout_marginStart="8dp"

            android:clickable="false"

            android:focusable="false"

            tools:text="Gmail"/>



        <ImageButton

            android:id="@+id/expand_menu_button"

            android:layout_width="16dp"

            android:layout_height="16dp"

            android:contentDescription="@string/expand_menu_text"

            android:src="@drawable/ic_baseline_expand_more_24"

            android:background="@null"

            android:scaleType="fitCenter"

            android:clickable="false"

            android:focusable="false"

            android:screenReaderFocusable="false"

            android:importantForAccessibility="no"

            android:contentDescription="@null"

            android:layout_marginHorizontal="8dp"

            android:layout_gravity="center_vertical"/>
@@ -90,6 +96,7 @@ 


    <com.android.wm.shell.windowdecor.MaximizeButtonView

        android:id="@+id/maximize_button_view"

        android:importantForAccessibility="no"

        android:layout_width="44dp"

        android:layout_height="40dp"

        android:layout_gravity="end"

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

+3 −1
Original line number Diff line number Diff line
@@ -43,13 +43,15 @@ 
            android:layout_height="@dimen/desktop_mode_caption_icon_radius"

            android:layout_marginStart="12dp"

            android:layout_marginEnd="12dp"

            android:contentDescription="@string/app_icon_text"/>

            android:contentDescription="@string/app_icon_text"

            android:importantForAccessibility="no"/>



        <TextView

            android:id="@+id/application_name"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            tools:text="Gmail"

            android:importantForAccessibility="no"

            android:textColor="?androidprv:attr/materialColorOnSurface"

            android:textSize="14sp"

            android:textFontWeight="500"

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

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
                android:id="@+id/maximize_menu_maximize_button"

                style="?android:attr/buttonBarButtonStyle"

                android:stateListAnimator="@null"

                android:importantForAccessibility="yes"

                android:contentDescription="@string/desktop_mode_maximize_menu_maximize_button_text"

                android:layout_marginRight="8dp"

                android:layout_marginBottom="4dp"

                android:alpha="0"/>
@@ -53,6 +55,7 @@ 
                android:layout_marginBottom="76dp"

                android:gravity="center"

                android:fontFamily="google-sans-text"

                android:importantForAccessibility="no"

                android:text="@string/desktop_mode_maximize_menu_maximize_text"

                android:textColor="?androidprv:attr/materialColorOnSurface"

                android:alpha="0"/>
@@ -78,6 +81,8 @@ 
                    android:layout_height="@dimen/desktop_mode_maximize_menu_button_height"

                    android:layout_marginRight="4dp"

                    android:background="@drawable/desktop_mode_maximize_menu_button_background"

                    android:importantForAccessibility="yes"

                    android:contentDescription="@string/desktop_mode_maximize_menu_snap_left_button_text"

                    android:stateListAnimator="@null"/>



                <Button
@@ -86,6 +91,8 @@ 
                    android:layout_width="41dp"

                    android:layout_height="@dimen/desktop_mode_maximize_menu_button_height"

                    android:background="@drawable/desktop_mode_maximize_menu_button_background"

                    android:importantForAccessibility="yes"

                    android:contentDescription="@string/desktop_mode_maximize_menu_snap_right_button_text"

                    android:stateListAnimator="@null"/>

            </LinearLayout>

            <TextView
@@ -96,6 +103,7 @@ 
                android:layout_marginBottom="76dp"

                android:layout_gravity="center"

                android:gravity="center"

                android:importantForAccessibility="no"

                android:fontFamily="google-sans-text"

                android:text="@string/desktop_mode_maximize_menu_snap_text"

                android:textColor="?androidprv:attr/materialColorOnSurface"

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

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 


    <FrameLayout

        android:layout_width="44dp"

        android:layout_height="40dp">

        android:layout_height="40dp"

        android:importantForAccessibility="noHideDescendants">

        <ProgressBar

            android:id="@+id/progress_bar"

            style="?android:attr/progressBarStyleHorizontal"