Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff78bf72 authored by Vikram Aggarwal's avatar Vikram Aggarwal Committed by Android (Google) Code Review
Browse files

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

parents be4a0325 f576dd6c

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />

src/com/android/settings/CryptKeeper.java

+1 −5
Original line number Diff line number Diff line
@@ -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