jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include non-drawable litho components in AX tree + small sidebar edit

Browse Source 
Summary:
Fixed issue with DebugComponentDescriptors being left out of accessibility tree so the AX tree now includes all Litho view nodes (not Litho accessibility nodes yet). Litho drawables have no accessibility properties so these are not included. Also changed default for getAXChildAt to do whatever the original view tree does for that node and added a getAXChildCount function to better customize the accessibility tree.

Segmented the ax sidebar into properties directly form the view and properties derived from the AccessibilityNodeInfo.

Differential Revision: D8861129

fbshipit-source-id: 987683ef45188aa9cb587cc0e5ffba8fbf40136d
This commit is contained in:
Sara Valderrama
2018-07-16 16:52:47 -07:00
committed by Facebook Github Bot
parent e83c8d31a2
commit 5ceb3e4ffe
5 changed files with 84 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
android/plugins/inspector/descriptors/ViewDescriptor.java
View File

@@ -36,6 +36,7 @@ import com.facebook.sonar.plugins.inspector.InspectorValue;
import com.facebook.sonar.plugins.inspector.Named;
import com.facebook.sonar.plugins.inspector.NodeDescriptor;
import com.facebook.sonar.plugins.inspector.Touch;
import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityRoleUtil;
import com.facebook.sonar.plugins.inspector.descriptors.utils.AccessibilityUtil;
import com.facebook.sonar.plugins.inspector.descriptors.utils.EnumMapping;
import com.facebook.sonar.plugins.inspector.descriptors.utils.ViewAccessibilityHelper;
@@ -43,7 +44,6 @@ import com.facebook.stetho.common.android.ResourcesUtil;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;
@@ -102,11 +102,6 @@ public class ViewDescriptor extends NodeDescriptor<View> {
return null;
}
@Override
public @Nullable Object getAXChildAt(View node, int index) {
return null;
}
@Override
public List<Named<SonarObject>> getData(View node) {
final SonarObject.Builder viewProps =
@@ -197,7 +192,9 @@ public class ViewDescriptor extends NodeDescriptor<View> {
@Override
public List<Named<SonarObject>> getAXData(View node) {
return Arrays.asList(new Named<>("AX Properties", getAccessibilityData(node)));
return Arrays.asList(
new Named<>("Derived Props", AccessibilityUtil.getDerivedAXData(node)),
new Named<>("AX Props", AccessibilityUtil.getViewAXData(node)));
}
private static SonarObject getAccessibilityData(View view) {
@@ -225,7 +222,9 @@ public class ViewDescriptor extends NodeDescriptor<View> {
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
@Override
public void setValue(View node, String[] path, SonarDynamic value) {
if (path[0].equals("Accessibility")) {
if (path[0].equals("Accessibility")
|| path[0].equals("AX Props")
|| path[0].equals("Derived Props")) {
setAccessibilityValue(node, path, value);
}
@@ -433,7 +432,12 @@ public class ViewDescriptor extends NodeDescriptor<View> {
}
public List<Named<String>> getAXAttributes(View node) throws Exception {
return Collections.EMPTY_LIST;
List<Named<String>> attributes = new ArrayList<>();
String role = AccessibilityRoleUtil.getRole(node).toString();
if (!role.equals("NONE")) {
attributes.add(new Named<>("role", role));
}
return attributes;
}
@Nullable