Merge "Revert "Revert "Fix no keyboard on N builds""" into nyc-dev

am: e744ca8

* commit 'e744ca887c820785a2f808be5fae8a7927f19cf3':
  Revert "Revert "Fix no keyboard on N builds""

Change-Id: Ief81ac3475ced17d249f50775f43fd7d9da77579

src/com/android/settings/CryptKeeper.java

@@ -799,6 +799,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
         // Asynchronously throw up the IME, since there are issues with requesting it to be shown
         // immediately.
         if (mLockPatternView == null && !mCooldown) {
+            getWindow().setSoftInputMode(
+                                WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
             mHandler.postDelayed(new Runnable() {
                 @Override public void run() {
                     imm.showSoftInputUnchecked(0, null);