commit 27d1033e489ffc0f94ae318f8de5ce72d3582bd2
author Wesley.CW Wang <wesleycwwang@google.com> Fri Jun 19 18:48:36 2020 +0800
committer Wesley.CW Wang <wesleycwwang@google.com> Tue Jun 23 14:20:43 2020 +0800
tree fedc870a48f9b134382f43681360feaf6fd63a5a
parent 42cf9daa5ba97cd32d158f70cf6ab6dcf213a1f8

Fix A11y tools focus on blocked component 1/2

 - Add a callback to BottomActionBar, let the registrant receive BottomActionBar's state and disable the a11y param when expended
 video: https://drive.google.com/file/d/1T1w1bnAoQYvgpdSa7eYsFPOspjWV4hEP/view?usp=sharing

 Bug: 157871987
 Test: manually

Change-Id: Idb7e49377782e7e2f8b382c8c26aa1388cbe8e58

src/com/android/customization/picker/theme/ThemeFragment.java

diff --git a/src/com/android/customization/picker/theme/ThemeFragment.java b/src/com/android/customization/picker/theme/ThemeFragment.java
index a6fdb28..077b733 100644
--- a/src/com/android/customization/picker/theme/ThemeFragment.java
+++ b/src/com/android/customization/picker/theme/ThemeFragment.java
@@ -57,6 +57,7 @@
 import com.android.wallpaper.module.InjectorProvider;
 import com.android.wallpaper.picker.AppbarFragment;
 import com.android.wallpaper.widget.BottomActionBar;
+import com.android.wallpaper.widget.BottomActionBar.AccessibilityCallback;
 
 import java.util.List;
 
@@ -166,6 +167,22 @@
                 R.layout.theme_info_view, /* root= */ null);
         mBottomActionBar.attachViewToBottomSheetAndBindAction(mThemeInfoView, INFORMATION);
         mBottomActionBar.setActionClickListener(CUSTOMIZE, this::onCustomizeClicked);
+
+        // Update target view's accessibility param since it will be blocked by the bottom sheet
+        // when expanded.
+        mBottomActionBar.setAccessibilityCallback(new AccessibilityCallback() {
+            @Override
+            public void onBottomSheetCollapsed() {
+                mOptionsContainer.setImportantForAccessibility(
+                        View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+            }
+
+            @Override
+            public void onBottomSheetExpanded() {
+                mOptionsContainer.setImportantForAccessibility(
+                        View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
+            }
+        });
     }
 
     @Override