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

Commit 99d8fae5 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Minor cleanup of left overs from GlowPadView integration."

parents 4461f602 a592d224

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -214,8 +214,8 @@ public class GlowPadView extends View { 
                mVibrationDuration);

                mVibrationDuration);

        mFeedbackCount = a.getInt(R.styleable.GlowPadView_feedbackCount,

        mFeedbackCount = a.getInt(R.styleable.GlowPadView_feedbackCount,

                mFeedbackCount);

                mFeedbackCount);

        mHandleDrawable = new TargetDrawable(res,

        TypedValue handle = a.peekValue(R.styleable.GlowPadView_handleDrawable);

                a.peekValue(R.styleable.GlowPadView_handleDrawable).resourceId);

        mHandleDrawable = new TargetDrawable(res, handle != null ? handle.resourceId : 0);

        mHandleDrawable.setState(TargetDrawable.STATE_INACTIVE);

        mHandleDrawable.setState(TargetDrawable.STATE_INACTIVE);

        mOuterRing = new TargetDrawable(res,

        mOuterRing = new TargetDrawable(res,

                getResourceId(a, R.styleable.GlowPadView_outerRingDrawable));

                getResourceId(a, R.styleable.GlowPadView_outerRingDrawable));
@@ -717,7 +717,7 @@ public class GlowPadView extends View { 
        startBackgroundAnimation(0, 0.0f);

        startBackgroundAnimation(0, 0.0f);

        stopAndHideWaveAnimation();

        stopAndHideWaveAnimation();

        hideTargets(animate, false);

        hideTargets(animate, false);

        hideGlow(0, 0, 1.0f, null);

        hideGlow(0, 0, 0.0f, null);

        Tweener.reset();

        Tweener.reset();

    }

    }

core/res/res/drawable-hdpi/ic_lockscreen_chevron_down.png

deleted100644 → 0
−1.08 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_lockscreen_chevron_left.png

deleted100644 → 0
−1.16 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_lockscreen_chevron_right.png

deleted100644 → 0
−1.15 KiB
Loading image diff...

core/res/res/drawable-hdpi/ic_lockscreen_chevron_up.png

deleted100644 → 0
−1.07 KiB
Loading image diff...