From 889a5ab0f7d116430fa417ef9aee2063207d62f2 Mon Sep 17 00:00:00 2001
From: sallyyuen <sallyyuen@google.com>
Date: Thu, 3 Feb 2022 13:36:55 -0800
Subject: [PATCH] fix TextView a11yNodeInfo isTextSelectable

info.TextSelectable needs to also check isTextEditable for edit texts.
Bug: n/a
Test: atest AccessibilityTextTraversalTest

Change-Id: Ic8d5a04db05f0cc4856997ecf5d5c51bc8d16da2
---
 core/java/android/widget/TextView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index be51240d2a84d..f2a77d87a0436 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -12197,7 +12197,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     EXTRA_DATA_RENDERING_INFO_KEY,
                     EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY
             ));
-            info.setTextSelectable(isTextSelectable());
+            info.setTextSelectable(isTextSelectable() || isTextEditable());
         } else {
             info.setAvailableExtraData(Arrays.asList(
                     EXTRA_DATA_RENDERING_INFO_KEY