commit 18dcd47796c4e6b5b3c31ea44abfb041a61857fc
author Vishwath Mohan <vishwath@google.com> Thu Mar 29 17:56:33 2018 +0000
committer Vishwath Mohan <vishwath@google.com> Fri Mar 30 10:58:59 2018 -0700
tree 769b09afcc5fb2cacfd146548254ecfc74f51ea1
parent 68458a5148b19d4cc9d271f5c84a97c52671a4da

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

core/java/com/android/internal/widget/LockPatternView.java

diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java
index 51dd929..e8fc598 100644
--- a/core/java/com/android/internal/widget/LockPatternView.java
+++ b/core/java/com/android/internal/widget/LockPatternView.java
@@ -1000,6 +1000,11 @@
             setPatternInProgress(false);
             cancelLineAnimations();
             notifyPatternDetected();
+            // Also clear pattern if fading is enabled
+            if (mFadePattern) {
+                clearPatternDrawLookup();
+                mPatternDisplayMode = DisplayMode.Correct;
+            }
             invalidate();
         }
         if (PROFILE_DRAWING) {