diff options
| author | Vikram Aggarwal <viki@google.com> | 2012-05-22 14:50:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-22 14:50:48 -0700 |
| commit | ff78bf7280b2f435bf09e0df0f252506b1c6af61 (patch) | |
| tree | 11922e378e722f2c52883999f8fd62eee6b1c034 /src | |
| parent | be4a032581ae6dfb41662486085e64052d085314 (diff) | |
| parent | f576dd6c9f2470516b2fd8494ad210a77f3c8c1f (diff) | |
| download | packages_apps_settings-ff78bf7280b2f435bf09e0df0f252506b1c6af61.zip packages_apps_settings-ff78bf7280b2f435bf09e0df0f252506b1c6af61.tar.gz packages_apps_settings-ff78bf7280b2f435bf09e0df0f252506b1c6af61.tar.bz2 | |
Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/CryptKeeper.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 1cb12f3..5fb72ed 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -170,8 +170,6 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList } else { final TextView status = (TextView) findViewById(R.id.status); status.setText(R.string.try_again); - status.setVisibility(View.VISIBLE); - // Reenable the password entry mPasswordEntry.setEnabled(true); } @@ -472,13 +470,11 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList // Re-enable the password entry and back presses. mPasswordEntry.setEnabled(true); mIgnoreBack = false; - status.setVisibility(View.GONE); + status.setText(R.string.enter_password); } else { CharSequence template = getText(R.string.crypt_keeper_cooldown); status.setText(TextUtils.expandTemplate(template, Integer.toString(mCooldown))); - status.setVisibility(View.VISIBLE); - mCooldown--; mHandler.removeMessages(MESSAGE_COOLDOWN); mHandler.sendEmptyMessageDelayed(MESSAGE_COOLDOWN, 1000); // Tick every second |