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

Commit ac20bfe1 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 98f95b3a: am f7e47a00: Merge "specify start value: Drawables don\'t have... 

am 98f95b3a: am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev

* commit '98f95b3a':
  specify start value: Drawables don't have getAlpha(). also, some clean up.
parents a4d8f804 98f95b3a

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewFlipper.java

+4 −2
Original line number Diff line number Diff line
@@ -128,22 +128,24 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard 


    @Override

    public void showBouncer(int duration) {

        KeyguardSecurityView active = getSecurityView();

        for (int i = 0; i < getChildCount(); i++) {

            View child = getChildAt(i);

            if (child instanceof KeyguardSecurityView) {

                KeyguardSecurityView ksv = (KeyguardSecurityView) child;

                ksv.showBouncer(child.getVisibility() == View.VISIBLE ? duration : 0);

                ksv.showBouncer(ksv == active ? duration : 0);

            }

        }

    }



    @Override

    public void hideBouncer(int duration) {

        KeyguardSecurityView active = getSecurityView();

        for (int i = 0; i < getChildCount(); i++) {

            View child = getChildAt(i);

            if (child instanceof KeyguardSecurityView) {

                KeyguardSecurityView ksv = (KeyguardSecurityView) child;

                ksv.hideBouncer(child.getVisibility() == View.VISIBLE ? duration : 0);

                ksv.hideBouncer(ksv == active ? duration : 0);

            }

        }

    }

policy/src/com/android/internal/policy/impl/keyguard/KeyguardSecurityViewHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public class KeyguardSecurityViewHelper { 
        }

        if (bouncerFrame != null) {

            if (duration > 0) {

                Animator anim = ObjectAnimator.ofInt(bouncerFrame, "alpha", 255);

                Animator anim = ObjectAnimator.ofInt(bouncerFrame, "alpha", 0, 255);

                anim.setDuration(duration);

                anim.start();

            } else {
@@ -67,7 +67,7 @@ public class KeyguardSecurityViewHelper { 
        }

        if (bouncerFrame != null) {

            if (duration > 0) {

                Animator anim = ObjectAnimator.ofInt(bouncerFrame, "alpha", 0);

                Animator anim = ObjectAnimator.ofInt(bouncerFrame, "alpha", 255, 0);

                anim.setDuration(duration);

                anim.start();

            } else {

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

+0 −77
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.FloatProperty;
@@ -62,7 +60,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 


    // Drawn to show the drag handle in closed state; crossfades to the challenge view

    // when challenge is fully visible

    private Drawable mFrameDrawable;

    private boolean mEdgeCaptured;



    private DisplayMetrics mDisplayMetrics;
@@ -127,8 +124,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
    private ObjectAnimator mHandleAnimation;

    private ObjectAnimator mFrameAnimation;



    private final Rect mTempRect = new Rect();



    private boolean mHasGlowpad;



    // We have an internal and external version, and we and them together.
@@ -149,23 +144,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
        }

    };



    static final Property<SlidingChallengeLayout, Float> FRAME_ALPHA =

            new FloatProperty<SlidingChallengeLayout>("frameAlpha") {

        @Override

        public void setValue(SlidingChallengeLayout view, float value) {

            if (view.mFrameDrawable != null) {

                view.mFrameAlpha = value;

                view.mFrameDrawable.setAlpha((int) (value * 0xFF));

                view.mFrameDrawable.invalidateSelf();

            }

        }



        @Override

        public Float get(SlidingChallengeLayout view) {

            return view.mFrameAlpha;

        }

    };



    // True if at least one layout pass has happened since the view was attached.

    private boolean mHasLayout;
@@ -310,46 +288,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
        mHandleAnimation.start();

    }



    void animateFrame(final boolean visible, final boolean full) {

        if (mFrameDrawable == null) return;



        final float targetAlpha = visible ? (full ? 1.f : 0.5f) : 0.f;

        if (mFrameAnimation != null && targetAlpha != mFrameAnimationTarget) {

            mFrameAnimation.cancel();

            mFrameAnimationTarget = Float.MIN_VALUE;

        }

        if (targetAlpha == mFrameAlpha || targetAlpha == mFrameAnimationTarget) {

            return;

        }

        mFrameAnimationTarget = targetAlpha;



        mFrameAnimation = ObjectAnimator.ofFloat(this, FRAME_ALPHA, targetAlpha);

        mFrameAnimation.setInterpolator(sHandleFadeInterpolator);

        mFrameAnimation.setDuration(HANDLE_ANIMATE_DURATION);

        mFrameAnimation.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                mFrameAnimationTarget = Float.MIN_VALUE;



                if (!visible && full && mChallengeView != null) {

                    // Mess with padding/margin to remove insets on the bouncer frame.

                    mChallengeView.setPadding(0, 0, 0, 0);

                    LayoutParams lp = (LayoutParams) mChallengeView.getLayoutParams();

                    lp.leftMargin = lp.rightMargin = getChallengeMargin(true);

                    mChallengeView.setLayoutParams(lp);

                }

                mFrameAnimation = null;

            }



            @Override

            public void onAnimationCancel(Animator animation) {

                mFrameAnimationTarget = Float.MIN_VALUE;

                mFrameAnimation = null;

            }

        });

        mFrameAnimation.start();

    }



    private void sendInitialListenerUpdates() {

        if (mScrollListener != null) {

            int challengeTop = mChallengeView != null ? mChallengeView.getTop() : 0;
@@ -409,9 +347,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
            mScrollState = state;



            animateHandle(state == SCROLL_STATE_IDLE && !mChallengeShowing);

            if (!mIsBouncing) {

                animateFrame(false, false);

            }

            if (mScrollListener != null) {

                mScrollListener.onScrollStateChanged(state);

            }
@@ -543,18 +478,11 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
        // Mess with padding/margin to inset the bouncer frame.

        // We have more space available to us otherwise.

        if (mChallengeView != null) {

            if (mFrameDrawable == null || !mFrameDrawable.getPadding(mTempRect)) {

                mTempRect.set(0, 0, 0, 0);

            }

            mChallengeView.setPadding(mTempRect.left, mTempRect.top, mTempRect.right,

                    mTempRect.bottom);

            final LayoutParams lp = (LayoutParams) mChallengeView.getLayoutParams();

            lp.leftMargin = lp.rightMargin = getChallengeMargin(false);

            mChallengeView.setLayoutParams(lp);

        }



        animateFrame(true, true);



        if (mBouncerListener != null) {

            mBouncerListener.onBouncerStateChanged(true);

        }
@@ -571,7 +499,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
        if (mChallengeView != null) {

            mChallengeView.hideBouncer(HANDLE_ANIMATE_DURATION);

        }

        animateFrame(false, true);

        if (mBouncerListener != null) {

            mBouncerListener.onBouncerStateChanged(false);

        }
@@ -861,7 +788,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
                    mChallengeView.setVisibility(mChallengeShowing ? VISIBLE : INVISIBLE);

                }

                // We're going to play silly games with the frame's background drawable later.

                mFrameDrawable = mChallengeView.getBackground();

                if (!mHasLayout) {

                    // Set up the margin correctly based on our content for the first run.

                    mHasGlowpad = child.findViewById(R.id.keyguard_selector_view) != null;
@@ -971,9 +897,6 @@ public class SlidingChallengeLayout extends ViewGroup implements ChallengeLayout 
        }



        if (!mHasLayout) {

            if (mFrameDrawable != null) {

                mFrameDrawable.setAlpha(0);

            }

            mHasLayout = true;

        }

    }