summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorVishwath Mohan <vishwath@google.com>2018-03-29 17:56:33 +0000
committerVishwath Mohan <vishwath@google.com>2018-03-30 10:58:59 -0700
commit18dcd47796c4e6b5b3c31ea44abfb041a61857fc (patch)
tree769b09afcc5fb2cacfd146548254ecfc74f51ea1 /core/java
parent68458a5148b19d4cc9d271f5c84a97c52671a4da (diff)
Don't clear mPattern when clearing visual pattern.
This CL ensures that when clearing the lockscreen pattern in onHandleUp(), we retain mPattern. This fixes a bug that prevents changing from Pattern to other modalities. Bug: 77257848 Test: Change from pattern to pin/password Change-Id: Ied74eafd17939214c62bdd617ecef7a9974f755d
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/widget/LockPatternView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java
index 51dd92961f54..e8fc5989354a 100644
--- a/core/java/com/android/internal/widget/LockPatternView.java
+++ b/core/java/com/android/internal/widget/LockPatternView.java
@@ -1000,6 +1000,11 @@ public class LockPatternView extends View {
setPatternInProgress(false);
cancelLineAnimations();
notifyPatternDetected();
+ // Also clear pattern if fading is enabled
+ if (mFadePattern) {
+ clearPatternDrawLookup();
+ mPatternDisplayMode = DisplayMode.Correct;
+ }
invalidate();
}
if (PROFILE_DRAWING) {