Chromium Code Reviews| Index: content/public/android/java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java |
| diff --git a/content/public/android/java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java b/content/public/android/java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java |
| index f48e3e4f0163f90f569070001fcddac613d0156c..11debd7438c866f7d9f65d2e0fbffde8524f5a9c 100644 |
| --- a/content/public/android/java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java |
| +++ b/content/public/android/java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java |
| @@ -14,6 +14,7 @@ import android.view.Menu; |
| import android.view.MenuItem; |
| import android.view.View; |
| +import org.chromium.base.BuildInfo; |
| import org.chromium.content.R; |
| import org.chromium.content.browser.SelectionPopupController; |
| import org.chromium.ui.base.DeviceFormFactor; |
| @@ -109,6 +110,17 @@ public class FloatingPastePopupMenu implements PastePopupMenu { |
| SelectionPopupController.initializeMenu(mContext, mode, menu); |
| if (!mDelegate.canPaste()) menu.removeItem(R.id.select_action_menu_paste); |
| if (!mDelegate.canSelectAll()) menu.removeItem(R.id.select_action_menu_select_all); |
| + if (!mDelegate.canPasteAsPlainText()) { |
| + menu.removeItem(R.id.select_action_menu_paste_as_plain_text); |
| + } |
| + // TODO(ctzsm): Remove O check after O SDK rolls. |
| + if (BuildInfo.isAtLeastO()) { |
|
aelias_OOO_until_Jul13
2017/05/01 23:25:41
This if statement is no-op because canPasteAsPlain
Shimi Zhang
2017/05/02 00:17:46
Done.
|
| + MenuItem item = menu.findItem(R.id.select_action_menu_paste_as_plain_text); |
| + if (item != null) { |
| + item.setTitle(mContext.getResources().getIdentifier( |
| + "paste_as_plain_text", "string", "android")); |
| + } |
| + } |
| menu.removeItem(R.id.select_action_menu_cut); |
| menu.removeItem(R.id.select_action_menu_copy); |
| menu.removeItem(R.id.select_action_menu_share); |
| @@ -122,11 +134,16 @@ public class FloatingPastePopupMenu implements PastePopupMenu { |
| @Override |
| public boolean onActionItemClicked(ActionMode mode, MenuItem item) { |
| - if (item.getItemId() == R.id.select_action_menu_paste) { |
| + int id = item.getItemId(); |
| + if (id == R.id.select_action_menu_paste) { |
| mDelegate.paste(); |
| mode.finish(); |
| } |
| - if (item.getItemId() == R.id.select_action_menu_select_all) { |
| + if (id == R.id.select_action_menu_paste_as_plain_text) { |
| + mDelegate.pasteAsPlainText(); |
| + mode.finish(); |
| + } |
| + if (id == R.id.select_action_menu_select_all) { |
| mDelegate.selectAll(); |
| mode.finish(); |
| } |