Merge "Do not let pattern be dragged" into qt-r1-dev

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

@@ -626,6 +626,13 @@ public class LockPatternView extends View {
         invalidate();
     }
 
+    /**
+     * 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.

packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java

@@ -248,7 +248,8 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
 
     @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 */

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

@@ -271,8 +271,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
         mSwipeUpToRetry = mUnlockMethodCache.isUnlockingWithFacePossible()
                 && securityMode != SecurityMode.SimPin
                 && securityMode != SecurityMode.SimPuk
-                && securityMode != SecurityMode.None
-                && securityMode != SecurityMode.Pattern;
+                && securityMode != SecurityMode.None;
     }
 
     public CharSequence getTitle() {