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

Commit 25c429f0 authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Add guard to access drawer toolbar when setting accessibility, because... 

Merge "Add guard to access drawer toolbar when setting accessibility, because this toolbar does not exist in fixed_layout mode." into nyc-dev
parents 880ece94 1dad12e2

src/com/android/documentsui/dirlist/DirectoryFragment.java

+13 −6
Original line number Diff line number Diff line
@@ -527,10 +527,14 @@ public class DirectoryFragment extends Fragment 


            // Re-enable TalkBack for the toolbars, as they are no longer covered by action mode.

            final Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar);

            final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(R.id.roots_toolbar);

            toolbar.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);



            // This toolbar is not present in the fixed_layout

            final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(R.id.roots_toolbar);

            if (rootsToolbar != null) {

                rootsToolbar.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);

            }

        }



        @Override

        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
@@ -544,13 +548,16 @@ public class DirectoryFragment extends Fragment 
                // Hide the toolbars if action mode is enabled, so TalkBack doesn't navigate to

                // these controls when using linear navigation.

                final Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar);

                final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(

                        R.id.roots_toolbar);

                toolbar.setImportantForAccessibility(

                        View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);



                // This toolbar is not present in the fixed_layout

                final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(

                        R.id.roots_toolbar);

                if (rootsToolbar != null) {

                    rootsToolbar.setImportantForAccessibility(

                            View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);



                }

                return true;

            }