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

Commit 904f26bd authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am f7e820bb: Merge "Fix 6693743: update animation ring for keyguard and search panel" into jb-dev 

* commit 'f7e820bb':
  Fix 6693743: update animation ring for keyguard and search panel
parents 017e9160 f7e820bb

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

+2 −7
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ public class GlowPadView extends View { 
                mHandleDrawable.setAlpha(0.0f);

                deactivateTargets();

                showTargets(true);

                ping();

                startBackgroundAnimation(INITIAL_SHOW_HANDLE_DURATION, 1.0f);

                setGrabbedState(OnTriggerListener.CENTER_HANDLE);

                if (AccessibilityManager.getInstance(mContext).isEnabled()) {
@@ -484,11 +483,7 @@ public class GlowPadView extends View { 
        final int duration = animate ? HIDE_ANIMATION_DURATION : 0;

        final int delay = animate ? HIDE_ANIMATION_DELAY : 0;



        // TODO: add an attribute for this. For now we'll show the expand for navbar, but not

        // keyguard.

        final boolean expandDisabled = !mAlwaysTrackFinger;



        final float targetScale = (expanded || expandDisabled) ?

        final float targetScale = expanded ?

                TARGET_SCALE_EXPANDED : TARGET_SCALE_COLLAPSED;

        final int length = mTargetDrawables.size();

        final TimeInterpolator interpolator = Ease.Cubic.easeOut;
@@ -504,7 +499,7 @@ public class GlowPadView extends View { 
                    "onUpdate", mUpdateListener));

        }



        final float ringScaleTarget = (expanded || expandDisabled) ?

        final float ringScaleTarget = expanded ?

                RING_SCALE_EXPANDED : RING_SCALE_COLLAPSED;

        mTargetAnimations.add(Tweener.to(mOuterRing, duration,

                "ease", interpolator,

core/res/res/drawable/ic_lockscreen_outerring.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ 
    <size android:height="@dimen/keyguard_lockscreen_outerring_diameter"

          android:width="@dimen/keyguard_lockscreen_outerring_diameter" />

    <solid android:color="#00000000" />

    <stroke android:color="#00000000" android:width="2dp" />

    <stroke android:color="#1affffff" android:width="2dp" />

</shape>

packages/SystemUI/res/drawable/navbar_search_outerring.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
    <size android:height="@dimen/navbar_search_outerring_diameter"

        android:width="@dimen/navbar_search_outerring_diameter" />

    <solid android:color="#00000000" />

    <stroke android:color="#00000000" android:width="2dp" />

    <stroke android:color="#40ffffff" android:width="2dp" />

</shape>

packages/SystemUI/res/layout-land/status_bar_search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                prvandroid:outerRadius="@dimen/navbar_search_outerring_radius"

                prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"

                prvandroid:snapMargin="@dimen/navbar_search_snap_margin"

                prvandroid:feedbackCount="1"

                prvandroid:feedbackCount="0"

                prvandroid:vibrationDuration="@integer/config_vibration_duration"

                prvandroid:alwaysTrackFinger="true"

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

packages/SystemUI/res/layout-port/status_bar_search_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
                prvandroid:outerRadius="@dimen/navbar_search_outerring_radius"

                prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"

                prvandroid:snapMargin="@dimen/navbar_search_snap_margin"

                prvandroid:feedbackCount="1"

                prvandroid:feedbackCount="0"

                prvandroid:vibrationDuration="@integer/config_vibration_duration"

                prvandroid:alwaysTrackFinger="true"

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