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

Commit 3860981f authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "GlowPadView : Re-enable magneticTargets" into mr1-staging

parents 597fc332 8d037a2d

core/java/com/android/internal/widget/multiwaveview/GlowPadView.java

+6 −2
Original line number Diff line number Diff line
@@ -951,6 +951,11 @@ public class GlowPadView extends View { 
                        if (angleMatches && (dist2(tx, ty) > snapDistance2)) {

                            activeTarget = i;

                            activeAngle = (float) -angleRad;

                            break;

                        } else if (dist2(tx, ty) > snapDistance2 &&

                            mMagneticTargets && activeTarget == -1) {

                            activeTarget = 0;

                            activeAngle = (float) -angleRad;

                        }

                    }

                }
@@ -970,7 +975,6 @@ public class GlowPadView extends View { 
            switchToState(STATE_TRACKING, x, y);

            updateGlowPosition(x, y);

        }



        if (mActiveTarget != activeTarget) {

            // Defocus the old target

            if (mActiveTarget != -1) {
@@ -988,7 +992,7 @@ public class GlowPadView extends View { 
                if (target.hasState(TargetDrawable.STATE_FOCUSED)) {

                    target.setState(TargetDrawable.STATE_FOCUSED);

                }

                if (mMagneticTargets) {

                if (mMagneticTargets && activeTarget <= 0) {

                    updateTargetPosition(activeTarget, mWaveCenterX, mWaveCenterY, activeAngle);

                }

                if (AccessibilityManager.getInstance(mContext).isEnabled()) {

core/res/res/layout/keyguard_glow_pad_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
    prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"

    prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin"

    prvandroid:firstItemOffset="@integer/kg_glowpad_rotation_offset"

    prvandroid:magneticTargets="false"

    prvandroid:magneticTargets="true"

    prvandroid:feedbackCount="1"

    prvandroid:vibrationDuration="20"

    prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"