| commit | fc8de93eede0d06c49870c9de46b120ad3ab25a1 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Thu Jun 13 14:20:52 2019 -0700 |
| committer | Lucas Dupin <dupin@google.com> | Thu Jun 13 15:48:49 2019 -0700 |
| tree | 2ce135ea57d48c897500fc8b6f7a516c88b6b000 | |
| parent | 027ffd9dd7591f3f8cb981c964a4886e771f944f [diff] |
Do not let pattern be dragged Test: drag accross pattern Test: start dragging from edges Test: start drawing, drag outside the bounds Test: repeat on small and large device Fixes: 132687980 Change-Id: Idab9279dd7cb002cbd43aab0ce1d48f265d39f04
diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 2218267..3f6c4d4 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java
@@ -627,6 +627,13 @@ } /** + * If there are any cells being drawn. + */ + public boolean isEmpty() { + return mPattern.isEmpty(); + } + + /** * Clear the pattern lookup table. Also reset the line fade start times for * the next attempt. */
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java index 362ead3..55ddfc3 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
@@ -248,7 +248,8 @@ @Override public boolean disallowInterceptTouch(MotionEvent event) { - return mLockPatternScreenBounds.contains((int) event.getRawX(), (int) event.getRawY()); + return !mLockPatternView.isEmpty() + || mLockPatternScreenBounds.contains((int) event.getRawX(), (int) event.getRawY()); } /** TODO: hook this up */
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index b6f42df..69630c4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -271,8 +271,7 @@ mSwipeUpToRetry = mUnlockMethodCache.isUnlockingWithFacePossible() && securityMode != SecurityMode.SimPin && securityMode != SecurityMode.SimPuk - && securityMode != SecurityMode.None - && securityMode != SecurityMode.Pattern; + && securityMode != SecurityMode.None; } public CharSequence getTitle() {