From f576dd6c9f2470516b2fd8494ad210a77f3c8c1f Mon Sep 17 00:00:00 2001 From: Vikram Aggarwal Date: Tue, 22 May 2012 10:58:10 -0700 Subject: [PATCH] Show keyboard selectively, do not listen on MCC/MNC changes, show text to user. Fix b/6531158 (Stop showing the keyboard) Fix b/6532201 (Stop removing the text view, and prompt the user with a message) Fix b/6155075 (Stop listening to MCC/MNC changes) Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6 --- AndroidManifest.xml | 4 ++-- src/com/android/settings/CryptKeeper.java | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8386c3a29ff..1eb4d873d36 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1416,8 +1416,8 @@ android:launchMode="singleTop" android:excludeFromRecents="true" android:theme="@android:style/Theme.Holo.NoActionBar" - android:configChanges="mcc|mnc|keyboard|keyboardHidden|uiMode" - android:windowSoftInputMode="stateVisible|adjustResize"> + android:configChanges="keyboard|keyboardHidden|uiMode" + android:windowSoftInputMode="adjustResize"> diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 1cb12f3f83b..5fb72edfcaa 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