Brion VIBBER has submitted this change and it was merged. Change subject: Hide keyboard when edit activity exits ......................................................................
Hide keyboard when edit activity exits Bug: 61326 Change-Id: I72b02772181688f52cea266a4a37c18792f4b637 --- M wikipedia/AndroidManifest.xml M wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml index fd32578..dd218cc 100644 --- a/wikipedia/AndroidManifest.xml +++ b/wikipedia/AndroidManifest.xml @@ -56,7 +56,7 @@ android:label="@string/langlinks_activity_title" /> <activity android:name=".editing.EditSectionActivity" - android:windowSoftInputMode="adjustResize" + android:windowSoftInputMode="adjustResize|stateVisible" /> <activity android:name=".login.LoginActivity" android:label="@string/login_activity_title" diff --git a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java index 29bbf9e..c7a57b1 100644 --- a/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/editing/EditSectionActivity.java @@ -228,6 +228,7 @@ progressDialog.hide(); setResult(EditHandler.RESULT_REFRESH_PAGE); Toast.makeText(EditSectionActivity.this, R.string.edit_saved_successfully, Toast.LENGTH_LONG).show(); + Utils.hideSoftKeyboard(EditSectionActivity.this); finish(); } else if (result instanceof CaptchaEditResult) { captchaEditResult = (CaptchaEditResult) result; @@ -258,10 +259,7 @@ throw new RuntimeException(e); } abusefilterBridge.sendMessage("displayWarning", payload); - if (getCurrentFocus() != null) { - InputMethodManager keyboard = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); - keyboard.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); - } + Utils.hideSoftKeyboard(this); Utils.fadeIn(abusefilterContainer); progressDialog.dismiss(); } @@ -316,6 +314,7 @@ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: + Utils.hideSoftKeyboard(this); finish(); return true; case R.id.menu_save_section: @@ -376,6 +375,7 @@ } else if (abusefilterEditResult != null) { cancelAbuseFilter(); } else { + Utils.hideSoftKeyboard(this); finish(); } } -- To view, visit https://gerrit.wikimedia.org/r/113773 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72b02772181688f52cea266a4a37c18792f4b637 Gerrit-PatchSet: 4 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits