commit 17b0f771d94469e4efd1c5bccf8e2a81e868b608
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Mar 07 11:24:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 07 11:24:31 2022 +0000
tree ab1ba7bc6c0244b5da0785b11e846cdf53266a38
parent 69df2e136d1a8706251006260e369b511f9e41ae
parent 3cd6220b3e6970c535433f07460b6cdf1eb77bda

Merge "Fix a11y focus traversal order for Photos|Albums and WorkProfile button" into sc-mainline-prod am: 3cd6220b3e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/17032925

Change-Id: Id78c46b180d1ff862393cfe9a7919ce7f88a03c3

res/layout/activity_photo_picker.xml

diff --git a/res/layout/activity_photo_picker.xml b/res/layout/activity_photo_picker.xml
index 6d6077f..5e5460d 100644
--- a/res/layout/activity_photo_picker.xml
+++ b/res/layout/activity_photo_picker.xml
@@ -68,13 +68,16 @@
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/fragment_container"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent"
+                android:accessibilityTraversalAfter="@+id/profile_button"/>
 
             <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
                 android:background="@android:color/transparent"
+                android:importantForAccessibility="yes"
+                android:accessibilityTraversalAfter="@+id/privacy_text"
                 app:liftOnScroll="true">
 
                 <androidx.appcompat.widget.Toolbar
@@ -117,6 +120,7 @@
                 android:textColor="?attr/pickerProfileButtonTextColor"
                 android:text="@string/picker_work_profile"
                 android:visibility="gone"
+                android:accessibilityTraversalAfter="@+id/tab_layout"
                 app:backgroundTint="?attr/pickerProfileButtonColor"
                 app:borderWidth="0dp"
                 app:elevation="3dp"