summaryrefslogtreecommitdiff
path: root/core/java/android/inputmethodservice/InputMethodService.java
diff options
context:
space:
mode:
authorAndrei Stingaceanu <stg@google.com>2015-06-11 14:38:58 +0100
committerAndrei Stingaceanu <stg@google.com>2015-06-11 14:43:41 +0100
commit00245473dbdf5469ad40d1ca6d2f53a87462efcb (patch)
tree1880d53a0396d3784eac93dab060d26249289d65 /core/java/android/inputmethodservice/InputMethodService.java
parentb51cdcc3a3f23ffbbc2c78ef3c69a97f18f03539 (diff)
Completely remove ExtractActionMode - master cherrypick
Use the floating toolbar action mode instead. This CL is identical to ag/701639. The merge to master was skipped due to a conflict. This is the 'manual merge' Bug: 20128047 Change-Id: I5ef9b4b5b9574a4a360a853b2d1abd5b374f2fd5
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
-rw-r--r--core/java/android/inputmethodservice/InputMethodService.java9
1 files changed, 1 insertions, 8 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index a7afa91e3fae..ae74b9aaed8b 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1797,16 +1797,9 @@ public class InputMethodService extends AbstractInputMethodService {
private void requestShowSelf(int flags) {
mImm.showSoftInputFromInputMethod(mToken, flags);
}
-
+
private boolean handleBack(boolean doIt) {
if (mShowInputRequested) {
- if (isExtractViewShown() && mExtractView instanceof ExtractEditLayout) {
- ExtractEditLayout extractEditLayout = (ExtractEditLayout) mExtractView;
- if (extractEditLayout.isActionModeStarted()) {
- if (doIt) extractEditLayout.finishActionMode();
- return true;
- }
- }
// If the soft input area is shown, back closes it and we
// consume the back key.
if (doIt) requestHideSelf(0);