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

Commit 68c24894 authored by Jim Miller's avatar Jim Miller
Browse files

Disable security view transitions in keyguard 

Now that we have a single stage unlock, there's no need for the transition. This
was causing unnecessary flickering to happen in views where we add the security view
just after inflation, which triggers the animation.

Fixes bug 7343632

Change-Id: I5bb8e37df66e4d96f00719e318424d46bf0e2e5a
parent 3b9f9bce

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

+14 −13
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ public class KeyguardHostView extends KeyguardViewBase { 
     * @param securityMode

     */

    private void showSecurityScreen(SecurityMode securityMode) {

        if (DEBUG) Log.d(TAG, "showSecurityScreen");

        if (DEBUG) Log.d(TAG, "showSecurityScreen(" + securityMode + ")");



        if (securityMode == mCurrentSecuritySelection) return;
@@ -628,10 +628,12 @@ public class KeyguardHostView extends KeyguardViewBase { 
        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));

            mSecurityViewContainer.setOutAnimation(

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

        }

        final int securityViewIdForMode = getSecurityViewIdForMode(securityMode);

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

            if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) {
@@ -640,7 +642,6 @@ public class KeyguardHostView extends KeyguardViewBase { 
            }

        }





        if (securityMode == SecurityMode.None) {

            // Discard current runnable if we're switching back to the selector view

            setOnDismissRunnable(null);