From 70e2ab2ec9a1df60b39987946af18cac8621b3b0 Mon Sep 17 00:00:00 2001
From: Marc Mulcahy <mmulcahy@amazon.com>
Date: Tue, 7 May 2019 03:20:20 -0700
Subject: [PATCH] Update Android view state when accessibility states are
 changed. (#24678)

Summary:
In #24095, we removed the code that changes the underlying Android view's enabled state to false when "disabled" is included in the accessibility states, which seems correct. The Android view's state shouldn't mirror the accessibility state, it should be the other way round-- the accessibility state should represent the state of the view.

It seems that the existing test is brokenly setting the disabled state in the Javascript object, and then querying the Android view's enabled state to confirm the change. If the Button implementation is actually the culprit, then IMHO, the correct fix would be to have the Button implementation manipulate the Android View's enabled state, not the accessibilityStates code.

[android] [fix] - Fix internal test case around disabled state of buttons
Pull Request resolved: https://github.com/facebook/react-native/pull/24678

Differential Revision: D15237590

Pulled By: cpojer

fbshipit-source-id: d7ebefbcba9d4d9425da4285175302e4b6435df7
---
 .../facebook/react/uimanager/BaseViewManager.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 3135afa71..bb559a64b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -146,11 +146,22 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       return;
     }
     view.setTag(R.id.accessibility_states, accessibilityStates);
+    view.setSelected(false);
+    view.setEnabled(true);
+    boolean shouldUpdateContentDescription = false;
     for (int i = 0; i < accessibilityStates.size(); i++) {
       String state = accessibilityStates.getString(i);
       if (sStateDescription.containsKey(state)) {
-        updateViewContentDescription(view);
+        shouldUpdateContentDescription = true;
       }
+      if (state.equals("selected")) {
+        view.setSelected(true);
+      } else if (state.equals("disabled")) {
+        view.setEnabled(false);
+      }
+    }
+    if (shouldUpdateContentDescription) {
+      updateViewContentDescription(view);
     }
   }