commit b6569313442300b15bcd46cbedc73f82ca481767
author Seigo Nonaka <nona@google.com> Thu Jun 04 03:28:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 04 03:28:21 2015 +0000
tree 415c5f816d27b6bf67b9c3c1c6e4a9da10cd999f
parent 09f32656986335eec62f8c20baae6bd4d62e362a
parent 66c80f2987d107664178f26b2b572a4d423d0e9d

am 66c80f29: am 254cc46e: am 02941b68: Merge "Hide software input when the Activity is closed." into mnc-dev

* commit '66c80f2987d107664178f26b2b572a4d423d0e9d':
  Hide software input when the Activity is closed.

src/com/android/contacts/activities/ContactEditorBaseActivity.java

diff --git a/src/com/android/contacts/activities/ContactEditorBaseActivity.java b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
index 1704ebe..5c45928 100644
--- a/src/com/android/contacts/activities/ContactEditorBaseActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorBaseActivity.java
@@ -38,6 +38,7 @@
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.RawContacts;
 import android.util.Log;
+import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
 
@@ -225,6 +226,15 @@
     }
 
     @Override
+    protected void onPause() {
+        super.onPause();
+        InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+        }
+    }
+
+    @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);