mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Revert D34518929: TalkBack support for ScrollView accessibility announcements (list and grid)
Differential Revision: D34518929 (https://github.com/facebook/react-native/commit/dd6325bafe1a539d348f3710e717a6344576b859) Original commit changeset: 410a05263a56 Original Phabricator Diff: D34518929 (https://github.com/facebook/react-native/commit/dd6325bafe1a539d348f3710e717a6344576b859) fbshipit-source-id: 114d0910970c5f5caefb98c378722faba283f2a1
This commit is contained in:
1 parent
cf55fd587e
commit
a12959546a
24 files changed
+51
-1055
No files matched your search
@@ -175,20 +175,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
|
||||
view.setTag(R.id.accessibility_role, AccessibilityRole.fromValue(accessibilityRole));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION)
|
||||
public void setAccessibilityCollection(
|
||||
@NonNull T view, @Nullable ReadableMap accessibilityCollection) {
|
||||
view.setTag(R.id.accessibility_collection, accessibilityCollection);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION_ITEM)
|
||||
public void setAccessibilityCollectionItem(
|
||||
@NonNull T view, @Nullable ReadableMap accessibilityCollectionItem) {
|
||||
view.setTag(R.id.accessibility_collection_item, accessibilityCollectionItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ReactProp(name = ViewProps.ACCESSIBILITY_STATE)
|
||||
public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {
|
||||
|
||||
@@ -31,14 +31,6 @@ public abstract class BaseViewManagerAdapter<T extends View>
|
||||
@Override
|
||||
public void setAccessibilityRole(@NonNull T view, @Nullable String accessibilityRole) {}
|
||||
|
||||
@Override
|
||||
public void setAccessibilityCollection(
|
||||
@NonNull T view, @Nullable ReadableMap accessibilityCollection) {}
|
||||
|
||||
@Override
|
||||
public void setAccessibilityCollectionItem(
|
||||
@NonNull T view, @Nullable ReadableMap accessibilityCollectionItem) {}
|
||||
|
||||
@Override
|
||||
public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {}
|
||||
|
||||
|
||||
@@ -48,12 +48,6 @@ public abstract class BaseViewManagerDelegate<T extends View, U extends BaseView
|
||||
case ViewProps.ACCESSIBILITY_STATE:
|
||||
mViewManager.setViewState(view, (ReadableMap) value);
|
||||
break;
|
||||
case ViewProps.ACCESSIBILITY_COLLECTION:
|
||||
mViewManager.setAccessibilityCollection(view, (ReadableMap) value);
|
||||
break;
|
||||
case ViewProps.ACCESSIBILITY_COLLECTION_ITEM:
|
||||
mViewManager.setAccessibilityCollectionItem(view, (ReadableMap) value);
|
||||
break;
|
||||
case ViewProps.BACKGROUND_COLOR:
|
||||
mViewManager.setBackgroundColor(
|
||||
view, value == null ? 0 : ColorPropConverter.getColor(value, view.getContext()));
|
||||
|
||||
@@ -28,10 +28,6 @@ public interface BaseViewManagerInterface<T extends View> {
|
||||
|
||||
void setAccessibilityRole(T view, @Nullable String accessibilityRole);
|
||||
|
||||
void setAccessibilityCollection(T view, @Nullable ReadableMap accessibilityCollection);
|
||||
|
||||
void setAccessibilityCollectionItem(T view, @Nullable ReadableMap accessibilityCollectionItem);
|
||||
|
||||
void setViewState(T view, @Nullable ReadableMap accessibilityState);
|
||||
|
||||
void setBackgroundColor(T view, int backgroundColor);
|
||||
|
||||
-20
@@ -122,7 +122,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
|
||||
TABLIST,
|
||||
TIMER,
|
||||
LIST,
|
||||
GRID,
|
||||
TOOLBAR;
|
||||
|
||||
public static String getValue(AccessibilityRole role) {
|
||||
@@ -153,8 +152,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
|
||||
return "android.widget.Switch";
|
||||
case LIST:
|
||||
return "android.widget.AbsListView";
|
||||
case GRID:
|
||||
return "android.widget.GridView";
|
||||
case NONE:
|
||||
case LINK:
|
||||
case SUMMARY:
|
||||
@@ -245,22 +242,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
|
||||
}
|
||||
final ReadableArray accessibilityActions =
|
||||
(ReadableArray) host.getTag(R.id.accessibility_actions);
|
||||
|
||||
final ReadableMap accessibilityCollectionItem =
|
||||
(ReadableMap) host.getTag(R.id.accessibility_collection_item);
|
||||
if (accessibilityCollectionItem != null) {
|
||||
int rowIndex = accessibilityCollectionItem.getInt("rowIndex");
|
||||
int columnIndex = accessibilityCollectionItem.getInt("columnIndex");
|
||||
int rowSpan = accessibilityCollectionItem.getInt("rowSpan");
|
||||
int columnSpan = accessibilityCollectionItem.getInt("columnSpan");
|
||||
boolean heading = accessibilityCollectionItem.getBoolean("heading");
|
||||
|
||||
AccessibilityNodeInfoCompat.CollectionItemInfoCompat collectionItemCompat =
|
||||
AccessibilityNodeInfoCompat.CollectionItemInfoCompat.obtain(
|
||||
rowIndex, rowSpan, columnIndex, columnSpan, heading);
|
||||
info.setCollectionItemInfo(collectionItemCompat);
|
||||
}
|
||||
|
||||
if (accessibilityActions != null) {
|
||||
for (int i = 0; i < accessibilityActions.size(); i++) {
|
||||
final ReadableMap action = accessibilityActions.getMap(i);
|
||||
@@ -485,7 +466,6 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
|
||||
|| view.getTag(R.id.accessibility_state) != null
|
||||
|| view.getTag(R.id.accessibility_actions) != null
|
||||
|| view.getTag(R.id.react_test_id) != null
|
||||
|| view.getTag(R.id.accessibility_collection_item) != null
|
||||
|| view.getTag(R.id.accessibility_links) != null)) {
|
||||
ViewCompat.setAccessibilityDelegate(
|
||||
view,
|
||||
|
||||
@@ -146,8 +146,6 @@ public class ViewProps {
|
||||
public static final String Z_INDEX = "zIndex";
|
||||
public static final String RENDER_TO_HARDWARE_TEXTURE = "renderToHardwareTextureAndroid";
|
||||
public static final String ACCESSIBILITY_LABEL = "accessibilityLabel";
|
||||
public static final String ACCESSIBILITY_COLLECTION = "accessibilityCollection";
|
||||
public static final String ACCESSIBILITY_COLLECTION_ITEM = "accessibilityCollectionItem";
|
||||
public static final String ACCESSIBILITY_HINT = "accessibilityHint";
|
||||
public static final String ACCESSIBILITY_LIVE_REGION = "accessibilityLiveRegion";
|
||||
public static final String ACCESSIBILITY_ROLE = "accessibilityRole";
|
||||
|
||||
Reference in new issue
Block a user