Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3be8361 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: 1cab7914

Change-Id: I3c64d325277fd2e989c3a454938fb0094b8add8c
parents ce22bc22 1cab7914

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

+7 −0
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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() {