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

Commit 729388de authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Reset view flipper alpha to 1." into tm-qpr-dev am: c9ef5a90 am: 9072e47a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21074610



Change-Id: I3fbaac18d93bf6cc8b589ac822f25d2736ed8aa3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e889113b 9072e47a

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+9 −8
Original line number Diff line number Diff line
@@ -235,14 +235,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                    }

                    updateChildren(0 /* translationY */, 1f /* alpha */);

                }



                private void updateChildren(int translationY, float alpha) {

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

                        View child = KeyguardSecurityContainer.this.getChildAt(i);

                        child.setTranslationY(translationY);

                        child.setAlpha(alpha);

                    }

                }

            };



    private final OnBackAnimationCallback mBackCallback = new OnBackAnimationCallback() {
@@ -594,6 +586,7 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
     * This will run when the bouncer shows in all cases except when the user drags the bouncer up.

     */

    public void startAppearAnimation(SecurityMode securityMode) {

        updateChildren(0 /* translationY */, 1f /* alpha */);

        mViewMode.startAppearAnimation(securityMode);

    }
@@ -777,6 +770,14 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
        setScaleY(scale);

    }



    private void updateChildren(int translationY, float alpha) {

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

            View child = getChildAt(i);

            child.setTranslationY(translationY);

            child.setAlpha(alpha);

        }

    }



    /**

     * Enscapsulates the differences between bouncer modes for the container.

     */