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

Commit 82b18e8d authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev

* commit '9de5901b':
  Don't crash if no ECA.
parents f080dc0c 9de5901b
Loading
Loading
Loading
Loading
+11 −6
Original line number Diff line number Diff line
@@ -129,12 +129,15 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
        mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled());

        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.setOnClickListener(new OnClickListener() {
                public void onClick(View v) {
                    mCallback.showBackupSecurity();
                }
            });
        }

        setFocusableInTouchMode(true);

@@ -148,6 +151,8 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
    }

    private void updateFooter(FooterMode mode) {
        if (mForgotPatternButton == null) return; // no ECA? no footer

        switch (mode) {
            case Normal:
                if (DEBUG) Log.d(TAG, "mode normal");