Merge "Show the keyboard less aggressively." into jb-mr1-lockscreen-dev

Author: dsandler

policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java

@@ -72,7 +72,9 @@ public boolean needsInput() {
     @Override
     public void onResume() {
         super.onResume();
-        mImm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        // XXX this is still not right because onResume is being called every time the page changes
+        mPasswordEntry.requestFocus();
+        mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
     }
 
     @Override