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

Browse Source
This commit is contained in:
Sally Yuen
2022-04-01 18:14:37 +00:00
committed by Android (Google) Code Review
parent 4ca3b32345 8021a8fb09
commit b9d928eae3
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();