commit cd8de46190b491b3cc4034f594cf6d713a42102f
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 15 19:35:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 15 19:35:26 2019 +0000
tree 031f3f8520d3dac8e1fe3580c922f55d0413068a
parent bf564f015e5ce95a1d21ed5c99a73b3d4d4dc28b
parent ac6b1a1c84e8ae08dfb0f6e7d01dfbe325512c8c

Merge "Use .setImageURI when updating the photo Uri" into qt-dev

src/com/android/contacts/editor/ContactEditorFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index a8e3cd8..ce4b9bc 100755
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -928,7 +928,7 @@
         }
 
         setEnabled(false);
-
+        hideSoftKeyboard();
         return doSaveAction(saveMode, /* joinContactId */ null);
     }
 
@@ -1837,4 +1837,12 @@
             RESTORE_FOCUS_DELAY_MILLIS);
     }
 
+    private void hideSoftKeyboard() {
+        InputMethodManager imm = (InputMethodManager) mContext.getSystemService(
+            Context.INPUT_METHOD_SERVICE);
+        if (imm != null && mContent != null) {
+            imm.hideSoftInputFromWindow(
+                mContent.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+        }
+    }
 }