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

am d63a1776: Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev

Browse Source 
* commit 'd63a177670a5f459f3380daff32e4561b0d5d26c':
  Make Text Selection Action Mode secondary items IF_ROOM
This commit is contained in:
Clara Bayarri
2015-06-02 01:25:42 +00:00
committed by Android Git Automerger
parent 3e03326719 d63a177670
commit 4ebfd76a89
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3115,35 +3115,30 @@ public class Editor {
if (mTextView.canCut()) { if (mTextView.canCut()) {
menu.add(0, TextView.ID_CUT, 0, com.android.internal.R.string.cut). menu.add(0, TextView.ID_CUT, 0, com.android.internal.R.string.cut).
setAlphabeticShortcut('x'). setAlphabeticShortcut('x').
setShowAsAction( setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
if (mTextView.canCopy()) { if (mTextView.canCopy()) {
menu.add(0, TextView.ID_COPY, 0, com.android.internal.R.string.copy). menu.add(0, TextView.ID_COPY, 0, com.android.internal.R.string.copy).
setAlphabeticShortcut('c'). setAlphabeticShortcut('c').
setShowAsAction( setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
if (mTextView.canPaste()) { if (mTextView.canPaste()) {
menu.add(0, TextView.ID_PASTE, 0, com.android.internal.R.string.paste). menu.add(0, TextView.ID_PASTE, 0, com.android.internal.R.string.paste).
setAlphabeticShortcut('v'). setAlphabeticShortcut('v').
setShowAsAction( setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
if (mTextView.canShare()) { if (mTextView.canShare()) {
menu.add(0, TextView.ID_SHARE, 0, com.android.internal.R.string.share). menu.add(0, TextView.ID_SHARE, 0, com.android.internal.R.string.share).
setShowAsAction( setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
if (mTextView.canSelectAllText()) { if (mTextView.canSelectAllText()) {
menu.add(0, TextView.ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll). menu.add(0, TextView.ID_SELECT_ALL, 0, com.android.internal.R.string.selectAll).
setAlphabeticShortcut('a'). setAlphabeticShortcut('a').
setShowAsAction( setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
updateReplaceItem(menu); updateReplaceItem(menu);
@@ -3157,8 +3152,7 @@ public class Editor {
for (ResolveInfo info : supportedActivities) { for (ResolveInfo info : supportedActivities) {
menu.add(info.loadLabel(packageManager)) menu.add(info.loadLabel(packageManager))
.setIntent(createProcessTextIntentForResolveInfo(info)) .setIntent(createProcessTextIntentForResolveInfo(info))
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} }
} }
} }
@@ -3190,8 +3184,7 @@ public class Editor {
boolean replaceItemExists = menu.findItem(TextView.ID_REPLACE) != null; boolean replaceItemExists = menu.findItem(TextView.ID_REPLACE) != null;
if (canReplace && !replaceItemExists) { if (canReplace && !replaceItemExists) {
menu.add(0, TextView.ID_REPLACE, 0, com.android.internal.R.string.replace). menu.add(0, TextView.ID_REPLACE, 0, com.android.internal.R.string.replace).
setShowAsAction( setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
} else if (!canReplace && replaceItemExists) { } else if (!canReplace && replaceItemExists) {
menu.removeItem(TextView.ID_REPLACE); menu.removeItem(TextView.ID_REPLACE);
} }