am 2c4de435: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev

* commit '2c4de435bf4dfb339fe7b36ab0f9ac93ed8120ce':
  Hide controls once password is known good
This commit is contained in:
Paul Lawrence
2014-09-25 10:03:46 +00:00
committed by Android Git Automerger

View File

@@ -155,6 +155,13 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
} }
private class DecryptTask extends AsyncTask<String, Void, Integer> { private class DecryptTask extends AsyncTask<String, Void, Integer> {
private void hide(int id) {
View view = findViewById(id);
if (view != null) {
view.setVisibility(View.GONE);
}
}
@Override @Override
protected Integer doInBackground(String... params) { protected Integer doInBackground(String... params) {
final IMountService service = getMountService(); final IMountService service = getMountService();
@@ -175,6 +182,12 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
mLockPatternView.removeCallbacks(mClearPatternRunnable); mLockPatternView.removeCallbacks(mClearPatternRunnable);
mLockPatternView.postDelayed(mClearPatternRunnable, RIGHT_PATTERN_CLEAR_TIMEOUT_MS); mLockPatternView.postDelayed(mClearPatternRunnable, RIGHT_PATTERN_CLEAR_TIMEOUT_MS);
} }
hide(R.id.passwordEntry);
hide(R.id.switch_ime_button);
hide(R.id.lockPattern);
hide(R.id.status);
hide(R.id.owner_info);
hide(R.id.emergencyCallButton);
} else if (failedAttempts == MAX_FAILED_ATTEMPTS) { } else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
// Factory reset the device. // Factory reset the device.
sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR")); sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));