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

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

Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev

parents e0ec5d42 22ae05d5

core/res/res/values/integers.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
-->

<resources>

    <integer name="kg_carousel_angle">75</integer>

    <integer name="kg_security_flip_duration">75</integer>

    <integer name="kg_security_fade_duration">75</integer>

    <integer name="kg_security_flip_duration">100</integer>

    <integer name="kg_security_fade_duration">100</integer>

    <integer name="kg_glowpad_rotation_offset">0</integer>

</resources>

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

+4 −7
Original line number Diff line number Diff line
@@ -670,13 +670,10 @@ public class KeyguardHostView extends KeyguardViewBase { 
        // Find and show this child.

        final int childCount = mSecurityViewContainer.getChildCount();



        // Do flip animation to the next screen

        if (false) {

        mSecurityViewContainer.setInAnimation(

                    AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_in));

                AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_fade_in));

        mSecurityViewContainer.setOutAnimation(

                    AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_out));

        }

                AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_fade_out));

        final int securityViewIdForMode = getSecurityViewIdForMode(securityMode);

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

            if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) {