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

Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

Browse Source
This commit is contained in:
Keisuke Kuroyanagi
2015-07-20 21:12:36 +00:00
committed by Android (Google) Code Review
parent b0e4a9e8a4 fd3eff27bd
commit 437eb6ce48
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/inputmethodservice/ExtractEditText.java
View File

@@ -103,8 +103,12 @@ public class ExtractEditText extends EditText {
} }
@Override public boolean onTextContextMenuItem(int id) { @Override public boolean onTextContextMenuItem(int id) {
// Select all shouldn't be handled by the original edit text, but by the extracted one. // Select all and Replace text shouldn't be handled by the original edit text, but by the
if (id != android.R.id.selectAll && mIME != null && mIME.onExtractTextContextMenuItem(id)) { // extracted one.
if (id == android.R.id.selectAll || id == android.R.id.replaceText) {
return super.onTextContextMenuItem(id);
}
if (mIME != null && mIME.onExtractTextContextMenuItem(id)) {
// Mode was started on Extracted, needs to be stopped here. // Mode was started on Extracted, needs to be stopped here.
// Cut will change the text, which stops selection mode. // Cut will change the text, which stops selection mode.
if (id == android.R.id.copy || id == android.R.id.paste) stopTextActionMode(); if (id == android.R.id.copy || id == android.R.id.paste) stopTextActionMode();

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

@@ -3225,7 +3225,8 @@ public class Editor {
} }
private void updateReplaceItem(Menu menu) { private void updateReplaceItem(Menu menu) {
boolean canReplace = mTextView.isSuggestionsEnabled() && shouldOfferToShowSuggestions(); boolean canReplace = mTextView.isSuggestionsEnabled() && shouldOfferToShowSuggestions()
&& !(mTextView.isInExtractedMode() && mTextView.hasSelection());
boolean replaceItemExists = menu.findItem(TextView.ID_REPLACE) != null; boolean replaceItemExists = menu.findItem(TextView.ID_REPLACE) != null;
if (canReplace && !replaceItemExists) { if (canReplace && !replaceItemExists) {
menu.add(Menu.NONE, TextView.ID_REPLACE, MENU_ITEM_ORDER_REPLACE, menu.add(Menu.NONE, TextView.ID_REPLACE, MENU_ITEM_ORDER_REPLACE,