diff options
| author | Xin Li <delphij@google.com> | 2019-02-23 00:39:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-23 00:39:16 +0000 |
| commit | f90d07b1b34bc63dfa7e72035f73680a54787ecc (patch) | |
| tree | e275779136a1b9b310e5df30f77641337a027f24 /core/java/android/widget | |
| parent | bcaf7945791830a045273d7a6f7007b419f2e2bd (diff) | |
| parent | b455c3a7f3e98f7a576cdc21bdc96ae8ec30c8f0 (diff) | |
Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/SelectionActionModeHelper.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/widget/SelectionActionModeHelper.java b/core/java/android/widget/SelectionActionModeHelper.java index 6cb0eaa7f47d..0d88e6986f11 100644 --- a/core/java/android/widget/SelectionActionModeHelper.java +++ b/core/java/android/widget/SelectionActionModeHelper.java @@ -31,6 +31,7 @@ import android.text.Layout; import android.text.Selection; import android.text.Spannable; import android.text.TextUtils; +import android.text.util.Linkify; import android.util.Log; import android.view.ActionMode; import android.view.textclassifier.SelectionEvent; @@ -1045,7 +1046,12 @@ public final class SelectionActionModeHelper { trimText(); final TextClassification classification; - if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.P) { + if (Linkify.containsUnsupportedCharacters(mText)) { + // Do not show smart actions for text containing unsupported characters. + android.util.EventLog.writeEvent(0x534e4554, "116321860", -1, ""); + classification = TextClassification.EMPTY; + } else if (mContext.getApplicationInfo().targetSdkVersion + >= Build.VERSION_CODES.P) { final TextClassification.Request request = new TextClassification.Request.Builder( mTrimmedText, mRelativeStart, mRelativeEnd) |