Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fixes for a11y selection". Reverts hiding some selection UI" into tm-dev am: b9d928eae3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17510341

Change-Id: Ia29767212458c009055a75b80d8bf5c43b019137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sally Yuen
2022-04-01 18:27:08 +00:00
committed by Automerger Merge Worker
parent 59ba8b344f b9d928eae3
commit cc2975c503
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/TextView.java
View File

@@ -12617,7 +12617,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;
}
}
@@ -13760,12 +13763,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();