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

Merge "No smart text assist for unprovisioned device." into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-30 22:31:14 +00:00
committed by Android (Google) Code Review
parent 857b0ff5d7 9796a1bd00
commit bda6275cf6
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/widget/Editor.java
View File

@@ -3909,25 +3909,30 @@ public class Editor {
menu.removeItem(TextView.ID_ASSIST);
final TextClassification textClassification =
getSelectionActionModeHelper().getTextClassification();
if (textClassification != null) {
final Drawable icon = textClassification.getIcon();
final CharSequence label = textClassification.getLabel();
final OnClickListener onClickListener =
textClassification.getOnClickListener();
final Intent intent = textClassification.getIntent();
if ((icon != null || !TextUtils.isEmpty(label))
&& (onClickListener != null || intent != null)) {
menu.add(TextView.ID_ASSIST, TextView.ID_ASSIST, MENU_ITEM_ORDER_ASSIST, label)
.setIcon(icon)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
mMetricsLogger.write(
new LogMaker(MetricsEvent.TEXT_SELECTION_MENU_ITEM_ASSIST)
.setType(MetricsEvent.TYPE_OPEN)
.setSubtype(textClassification.getLogType()));
}
if (canAssist()) {
menu.add(TextView.ID_ASSIST, TextView.ID_ASSIST, MENU_ITEM_ORDER_ASSIST,
textClassification.getLabel())
.setIcon(textClassification.getIcon())
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
mMetricsLogger.write(
new LogMaker(MetricsEvent.TEXT_SELECTION_MENU_ITEM_ASSIST)
.setType(MetricsEvent.TYPE_OPEN)
.setSubtype(textClassification.getLogType()));
}
}
private boolean canAssist() {
final TextClassification textClassification =
getSelectionActionModeHelper().getTextClassification();
return mTextView.isDeviceProvisioned()
&& textClassification != null
&& (textClassification.getIcon() != null
|| !TextUtils.isEmpty(textClassification.getLabel()))
&& (textClassification.getOnClickListener() != null
|| (textClassification.getIntent() != null
&& mTextView.getContext().canStartActivityForResult()));
}
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
getSelectionActionModeHelper().onSelectionAction();