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

Merge "Show keyboard selectively, do not listen on MCC/MNC changes, show text to user." into jb-dev

Browse Source
This commit is contained in:
Vikram Aggarwal
2012-05-22 14:50:48 -07:00
committed by Android (Google) Code Review
parent be4a032581 f576dd6c9f
commit ff78bf7280
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -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">
<intent-filter android:priority="10">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.HOME" />

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

@@ -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