From 1036c74784d8f8ca7232aaa26b1b0c3796c29d1d Mon Sep 17 00:00:00 2001
From: Andrei Stingaceanu <stg@google.com>
Date: Thu, 11 Jun 2015 14:34:50 +0000
Subject: Revert "Completely remove ExtractActionMode - master cherrypick"

This reverts commit 00245473dbdf5469ad40d1ca6d2f53a87462efcb.

Change-Id: If078c09fbdfd00d005ff58d543f03601b96eef0a
---
 core/java/android/inputmethodservice/InputMethodService.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'core/java/android/inputmethodservice/InputMethodService.java')

diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index ae74b9aaed8b..a7afa91e3fae 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1797,9 +1797,16 @@ 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);
-- 
cgit v1.2.3