diff options
Diffstat (limited to 'policy/src')
4 files changed, 4 insertions, 8 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java index 6938561..b2ce73e 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java @@ -256,12 +256,10 @@ public class KeyguardPasswordView extends LinearLayout private void verifyPasswordAndUnlock() { String entry = mPasswordEntry.getText().toString(); - boolean wrongPassword = true; if (mLockPatternUtils.checkPassword(entry)) { mCallback.reportSuccessfulUnlockAttempt(); KeyStore.getInstance().password(entry); mCallback.dismiss(true); - wrongPassword = false; } else if (entry.length() > MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT ) { // to avoid accidental lockout, only count attempts that are long enough to be a // real password. This may require some tweaking. @@ -271,9 +269,9 @@ public class KeyguardPasswordView extends LinearLayout long deadline = mLockPatternUtils.setLockoutAttemptDeadline(); handleAttemptLockout(deadline); } + mNavigationManager.setMessage( + mIsAlpha ? R.string.kg_wrong_password : R.string.kg_wrong_pin); } - mNavigationManager.setMessage(wrongPassword ? - (mIsAlpha ? R.string.kg_wrong_password : R.string.kg_wrong_pin) : 0); mPasswordEntry.setText(""); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java index 294ea5c..4861b78 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSimPinView.java @@ -91,8 +91,6 @@ public class KeyguardSimPinView extends LinearLayout } }); } - - setFocusableInTouchMode(true); reset(); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java index 06ed88a..20fad0b 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java @@ -119,7 +119,7 @@ class KeyguardStatusViewManager { mDateView = (TextView) findViewById(R.id.date); mStatus1View = (TextView) findViewById(R.id.status1); mAlarmStatusView = (TextView) findViewById(R.id.alarm_status); - mOwnerInfoView = (TextView) findViewById(R.id.propertyOf); + mOwnerInfoView = (TextView) findViewById(R.id.owner_info); mDigitalClock = (DigitalClock) findViewById(R.id.time); // Registering this callback immediately updates the battery state, among other things. diff --git a/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardStatusViewManager.java index 409f87b..b6ffde0 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard_obsolete/KeyguardStatusViewManager.java @@ -179,7 +179,7 @@ class KeyguardStatusViewManager implements OnClickListener { mDateView = (TextView) findViewById(R.id.date); mStatus1View = (TextView) findViewById(R.id.status1); mAlarmStatusView = (TextView) findViewById(R.id.alarm_status); - mOwnerInfoView = (TextView) findViewById(R.id.propertyOf); + mOwnerInfoView = (TextView) findViewById(R.id.owner_info); mTransportView = (TransportControlView) findViewById(R.id.transport); mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton); mEmergencyCallButtonEnabledInScreen = emergencyButtonEnabledInScreen; |