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

Commit be699645 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I56544d0e into eclair 

* changes:
  Fix for 2137900: Be more conservative about poking the wakelock
parents eb8d6f78 56544d0e

src/com/android/settings/ChooseLockPattern.java

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.google.android.collect.Lists; 
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;

import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;

import com.android.internal.widget.LockPatternView.Cell;

import static com.android.internal.widget.LockPatternView.DisplayMode;



import android.app.Activity;
@@ -124,6 +125,10 @@ public class ChooseLockPattern extends Activity implements View.OnClickListener{ 
                }

            }



            public void onPatternCellAdded(List<Cell> pattern) { 



            }



            private void patternInProgress() {

                mHeaderText.setText(R.string.lockpattern_recording_inprogress);

                mFooterText.setText("");

src/com/android/settings/ConfirmLockPattern.java

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;

import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;

import com.android.internal.widget.LockPatternView.Cell;



import android.app.Activity;

import android.content.Intent;
@@ -216,6 +217,10 @@ public class ConfirmLockPattern extends Activity { 
            mLockPatternView.removeCallbacks(mClearPatternRunnable);

        }



        public void onPatternCellAdded(List<Cell> pattern) {



        }



        public void onPatternDetected(List<LockPatternView.Cell> pattern) {

            if (mLockPatternUtils.checkPattern(pattern)) {

                setResult(RESULT_OK);