diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-10-31 14:33:32 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2012-10-31 17:49:10 -0700 |
| commit | c4842c11932ea4f60fe7ae09b0a59660207e1587 (patch) | |
| tree | 3181e8d1e9d489ea225b06961948e34dca24cd0a /core/java/com/android | |
| parent | c8dc8eb3275a6d05e27824f322796e97e5e50e2f (diff) | |
| download | frameworks_base-c4842c11932ea4f60fe7ae09b0a59660207e1587.zip frameworks_base-c4842c11932ea4f60fe7ae09b0a59660207e1587.tar.gz frameworks_base-c4842c11932ea4f60fe7ae09b0a59660207e1587.tar.bz2 | |
Accessibility support for the lockscreen - phone.
Change-Id: Idc99f1322a1d635dd07e1f5efa1665a4676267c2
Diffstat (limited to 'core/java/com/android')
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternView.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 6c5ed7e..7a76ab0 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -18,7 +18,6 @@ package com.android.internal.widget; import android.content.Context; -import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -33,11 +32,9 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; import android.util.AttributeSet; -import android.util.Log; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; import android.view.View; -import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityManager; import com.android.internal.R; @@ -657,9 +654,11 @@ public class LockPatternView extends View { handleActionMove(event); return true; case MotionEvent.ACTION_CANCEL: - resetPattern(); - mPatternInProgress = false; - notifyPatternCleared(); + if (mPatternInProgress) { + mPatternInProgress = false; + resetPattern(); + notifyPatternCleared(); + } if (PROFILE_DRAWING) { if (mDrawingProfilingStarted) { Debug.stopMethodTracing(); @@ -826,7 +825,7 @@ public class LockPatternView extends View { mPatternInProgress = true; mPatternDisplayMode = DisplayMode.Correct; notifyPatternStarted(); - } else { + } else if (mPatternInProgress) { mPatternInProgress = false; notifyPatternCleared(); } |