From 8021a8fb0979e5f937123e7d05263e016ff435f2 Mon Sep 17 00:00:00 2001
From: Sally Yuen <sallyyuen@google.com>
Date: Wed, 30 Mar 2022 20:20:44 +0000
Subject: [PATCH] Revert "Fixes for a11y selection". Reverts hiding some
 selection UI

This reverts commit 55022a5880614ff6f048ab622160059a164e83b1.

Reason for revert: b/226418848
Test: builds

Change-Id: Id709d131754e14a67805ee981bc5ad0bc759121f
---
 core/java/android/widget/TextView.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 6f83a45ce7c69..0157e005725de 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -12600,7 +12600,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     if (start >= 0 && start <= end && end <= text.length()) {
                         requestFocusOnNonEditableSelectableText();
                         Selection.setSelection((Spannable) text, start, end);
-                        hideAccessibilitySelectionControllers();
+                        // Make sure selection mode is engaged.
+                        if (mEditor != null) {
+                            mEditor.startSelectionActionModeAsync(false);
+                        }
                         return true;
                     }
                 }
@@ -13743,12 +13746,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             Selection.removeSelection((Spannable) text);
         }
         // Hide all selection controllers used for adjusting selection
-        // since we are doing so explicitly by other means and these
+        // since we are doing so explicitlty by other means and these
         // controllers interact with how selection behaves.
-        hideAccessibilitySelectionControllers();
-    }
-
-    private void hideAccessibilitySelectionControllers() {
         if (mEditor != null) {
             mEditor.hideCursorAndSpanControllers();
             mEditor.stopTextActionMode();