From b3c6ece78a171bcf2504808b4a7bd0cc2ce1d9fa Mon Sep 17 00:00:00 2001 From: Jan Althaus Date: Tue, 14 Nov 2017 15:40:16 +0100 Subject: Widget types for unselectable and custom views Added new constants to be used by custom text view implementions, as well as a special case for non-selectable text that will only become meaningful once we start logging linkified text. Bug: 67674199 Test: Tested that there are no regressions in the existing behaviour. Change-Id: I0167c39bdbde2783f13a8776d6e280aadf55476b --- core/java/android/widget/SelectionActionModeHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/java/android/widget/SelectionActionModeHelper.java') diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index 71854ae89290..d0ad27af0a92 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -591,7 +591,9 @@ public final class SelectionActionModeHelper { Preconditions.checkNotNull(textView); final @SmartSelectionEventTracker.WidgetType int widgetType = textView.isTextEditable() ? SmartSelectionEventTracker.WidgetType.EDITTEXT - : SmartSelectionEventTracker.WidgetType.TEXTVIEW; + : (textView.isTextSelectable() + ? SmartSelectionEventTracker.WidgetType.TEXTVIEW + : SmartSelectionEventTracker.WidgetType.UNSELECTABLE_TEXTVIEW); mDelegate = new SmartSelectionEventTracker(textView.getContext(), widgetType); mEditTextLogger = textView.isTextEditable(); mWordIterator = BreakIterator.getWordInstance(textView.getTextLocale()); -- cgit v1.2.3