[MediaWiki-commits] [Gerrit] Hide keyboard when login screen exits - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has submitted this change and it was merged.

Change subject: Hide keyboard when login screen exits
......................................................................


Hide keyboard when login screen exits

In a sane system there must exist another way of doing this.
I hope Android is sane

Bug: 61325

Change-Id: I24ed794e0a64a5883786ddb8f41aa199b3354311
---
M wikipedia/AndroidManifest.xml
M wikipedia/src/main/java/org/wikipedia/Utils.java
M wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
3 files changed, 20 insertions(+), 1 deletion(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml
index cd190cd..fd32578 100644
--- a/wikipedia/AndroidManifest.xml
+++ b/wikipedia/AndroidManifest.xml
@@ -60,7 +60,7 @@
                 />
         <activity android:name=".login.LoginActivity"
                   android:label="@string/login_activity_title"
-                  android:windowSoftInputMode="stateAlwaysVisible"
+                  android:windowSoftInputMode="stateVisible"
                 />
 
         <provider
diff --git a/wikipedia/src/main/java/org/wikipedia/Utils.java 
b/wikipedia/src/main/java/org/wikipedia/Utils.java
index 461a01c..027ed6d 100644
--- a/wikipedia/src/main/java/org/wikipedia/Utils.java
+++ b/wikipedia/src/main/java/org/wikipedia/Utils.java
@@ -2,11 +2,14 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.app.Activity;
 import android.content.Context;
 import android.os.Looper;
+import android.support.v7.app.ActionBarActivity;
 import android.text.format.DateUtils;
 import android.util.Base64;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -179,4 +182,16 @@
             throw new IllegalStateException("Method must be called from the 
Main Thread");
         }
     }
+
+    /**
+     * Attempt to hide the Android Keyboard
+     *
+     * @param activity The current activity
+     */
+    public static void hideSoftKeyboard(Activity activity) {
+        if (activity.getCurrentFocus() != null) {
+            InputMethodManager keyboard = 
(InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+            
keyboard.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), 
0);
+        }
+    }
 }
\ No newline at end of file
diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java 
b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
index 34b28ea..d2d25ca 100644
--- a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -16,6 +16,7 @@
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
 import org.wikipedia.R;
+import org.wikipedia.Utils;
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.login.LoginTask;
 
@@ -122,6 +123,8 @@
                     // Clear the edit tokens - clears out any anon tokens we 
might have had
                     app.getEditTokenStorage().clearAllTokens();
 
+                    Utils.hideSoftKeyboard(LoginActivity.this);
+
                     finish();
                 } else {
                     handleError(result);
@@ -134,6 +137,7 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
+                Utils.hideSoftKeyboard(LoginActivity.this);
                 finish();
                 break;
             case R.id.menu_login:

-- 
To view, visit https://gerrit.wikimedia.org/r/113772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I24ed794e0a64a5883786ddb8f41aa199b3354311
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Nicole <nic...@hitori.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits