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

Commit ccbd67a2 authored by Justin Chung's avatar Justin Chung
Browse files

Feature flag enlargeVertexEntryArea 

1. Flag feature
2. Increase isVertex readability

Bug: 276396206
Test: Manual test
Change-Id: I0daa91ae37d733f990d085d9b6926b88952fc82c
parent 10902877

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

+16 −6
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class LockPatternView extends View { 
    private int mDotColor;

    private int mDotActivatedColor;

    private boolean mKeepDotActivated;

    private boolean mEnlargeVertex;



    private final Interpolator mFastOutSlowInInterpolator;

    private final Interpolator mLinearOutSlowInInterpolator;
@@ -341,6 +342,7 @@ public class LockPatternView extends View { 
        mDotColor = a.getColor(R.styleable.LockPatternView_dotColor, mRegularColor);

        mDotActivatedColor = a.getColor(R.styleable.LockPatternView_dotActivatedColor, mDotColor);

        mKeepDotActivated = a.getBoolean(R.styleable.LockPatternView_keepDotActivated, false);

        mEnlargeVertex = a.getBoolean(R.styleable.LockPatternView_enlargeVertexEntryArea, false);



        int pathColor = a.getColor(R.styleable.LockPatternView_pathColor, mRegularColor);

        mPathPaint.setColor(pathColor);
@@ -957,12 +959,20 @@ public class LockPatternView extends View { 
            for (int column = 0; column < 3; column++) {

                float centerY = getCenterYForRow(row);

                float centerX = getCenterXForColumn(column);

                float hitRadiusSquared;



                if (mEnlargeVertex) {

                    // Maximize vertex dots' hit radius for the small screen.

                    // This eases users to draw more patterns with diagnal lines, while keeps

                    // drawing patterns with vertex dots easy.

                    hitRadiusSquared =

                            isVertex(row, column)

                                    ? (mDotHitMaxRadius * mDotHitMaxRadius)

                                    : (mDotHitRadius * mDotHitRadius);

                } else {

                    hitRadiusSquared = mDotHitRadius * mDotHitRadius;

                }



                // Maximize vertax dots' hit radius for the small(watch) screen.

                // This eases users to draw more patterns with diagnal lines, while keeps drawing

                // patterns with vertax dots easy.

                float hitRadiusSquared = isVertex(row, column) ? (mDotHitMaxRadius

                        * mDotHitMaxRadius) : (mDotHitRadius * mDotHitRadius);

                if ((x - centerX) * (x - centerX) + (y - centerY) * (y - centerY)

                        < hitRadiusSquared) {

                    return Cell.of(row, column);
@@ -973,7 +983,7 @@ public class LockPatternView extends View { 
    }



    private boolean isVertex(int row, int column) {

        return (row != 1 && column != 1);

        return !(row == 1 || column == 1);

    }



    @Override

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -9088,6 +9088,8 @@ 
        <attr name="dotActivatedColor" format="color|reference"/>

        <!-- Keep dot in activated state until segment completion -->

        <attr name="keepDotActivated" format="boolean"/>

        <!-- Enlarge vertex entry area for some form factors -->

        <attr name="enlargeVertexEntryArea" format="boolean"/>

    </declare-styleable>















    <!-- =============================== -->