PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Make IME handling deterministic in CryptKeeper"

Browse Source 
This reverts commit 4ae46cd1ad.

Bug: 36148078

Change-Id: I776ad2e6ba0eabacb3d6be6de23ba37fe5ce7bc7
This commit is contained in:
Tom Cherry
2017-03-15 01:09:42 +00:00
parent 4ae46cd1ad
commit cf026ead80
3 changed files with 14 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/CryptKeeper.java
View File

@@ -57,6 +57,7 @@ import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -65,7 +66,6 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
import com.android.settings.widget.ImeAwareEditText;
import java.util.List;
@@ -122,7 +122,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
private boolean mCooldown = false;
PowerManager.WakeLock mWakeLock;
private ImeAwareEditText mPasswordEntry;
private EditText mPasswordEntry;
private LockPatternView mLockPatternView;
/** Number of calls to {@link #notifyUser()} to ignore before notifying. */
private int mNotificationCountdown = 0;
@@ -277,7 +277,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
// Reenable the password entry
if (mPasswordEntry != null) {
mPasswordEntry.setEnabled(true);
mPasswordEntry.scheduleShowSoftInput();
final InputMethodManager imm = (InputMethodManager) getSystemService(
Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(mPasswordEntry, 0);
setBackFunctionality(true);
}
}
@@ -742,7 +744,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
private void passwordEntryInit() {
// Password/pin case
mPasswordEntry = (ImeAwareEditText) findViewById(R.id.passwordEntry);
mPasswordEntry = (EditText) findViewById(R.id.passwordEntry);
if (mPasswordEntry != null){
mPasswordEntry.setOnEditorActionListener(this);
mPasswordEntry.requestFocus();
@@ -795,13 +797,16 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
}
}
// Make sure that the IME is shown when everything becomes ready.
// 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);
if (mPasswordEntry != null) {
mPasswordEntry.scheduleShowSoftInput();
}
mHandler.postDelayed(new Runnable() {
@Override public void run() {
imm.showSoftInputUnchecked(0, null);
}
}, 0);
}
updateEmergencyCallButtonState();