Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-11-08 09:48:28 -08:00
committed by Android (Google) Code Review
parent 7d59cf9f10 b499b1fa08
commit 9de5901bb3
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/src/com/android/internal/policy/impl/keyguard/KeyguardPatternView.java
View File

@@ -129,12 +129,15 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled()); mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());
mForgotPatternButton = (Button) findViewById(R.id.forgot_password_button); mForgotPatternButton = (Button) findViewById(R.id.forgot_password_button);
// note: some configurations don't have an emergency call area
if (mForgotPatternButton != null) {
mForgotPatternButton.setText(R.string.kg_forgot_pattern_button_text); mForgotPatternButton.setText(R.string.kg_forgot_pattern_button_text);
mForgotPatternButton.setOnClickListener(new OnClickListener() { mForgotPatternButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
mCallback.showBackupSecurity(); mCallback.showBackupSecurity();
} }
}); });
}
setFocusableInTouchMode(true); setFocusableInTouchMode(true);
@@ -148,6 +151,8 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
} }
private void updateFooter(FooterMode mode) { private void updateFooter(FooterMode mode) {
if (mForgotPatternButton == null) return; // no ECA? no footer
switch (mode) { switch (mode) {
case Normal: case Normal:
if (DEBUG) Log.d(TAG, "mode normal"); if (DEBUG) Log.d(TAG, "mode normal");