PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 356ceb58: am be699645: Merge change I56544d0e into eclair

Browse Source 
Merge commit '356ceb5853243762d00d0c4e1482fbe887f66e3e'

* commit '356ceb5853243762d00d0c4e1482fbe887f66e3e':
  Fix for 2137900: Be more conservative about poking the wakelock
This commit is contained in:
Jim Miller
2009-10-01 11:40:29 -07:00
committed by Android Git Automerger
parent 9bae0a3178 356ceb5853
commit 1a9f1bd065
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ChooseLockPattern.java
View File

@@ -21,6 +21,7 @@ import com.google.android.collect.Lists;
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView; import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import static com.android.internal.widget.LockPatternView.DisplayMode; import static com.android.internal.widget.LockPatternView.DisplayMode;
import android.app.Activity; 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() { private void patternInProgress() {
mHeaderText.setText(R.string.lockpattern_recording_inprogress); mHeaderText.setText(R.string.lockpattern_recording_inprogress);
mFooterText.setText(""); mFooterText.setText("");

5
src/com/android/settings/ConfirmLockPattern.java
View File

@@ -19,6 +19,7 @@ package com.android.settings;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternView; import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternView.Cell;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
@@ -216,6 +217,10 @@ public class ConfirmLockPattern extends Activity {
mLockPatternView.removeCallbacks(mClearPatternRunnable); mLockPatternView.removeCallbacks(mClearPatternRunnable);
} }
public void onPatternCellAdded(List<Cell> pattern) {
}
public void onPatternDetected(List<LockPatternView.Cell> pattern) { public void onPatternDetected(List<LockPatternView.Cell> pattern) {
if (mLockPatternUtils.checkPattern(pattern)) { if (mLockPatternUtils.checkPattern(pattern)) {
setResult(RESULT_OK); setResult(RESULT_OK);