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

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

Merge "[Bouncer] Move reset logic to end event." into tm-dev am: 277f9b3b 

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



Change-Id: I3788e66d0e21224db071a5d660582160b8120fa9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 983af6a9 277f9b3b

packages/SettingsLib/src/com/android/settingslib/animation/AppearAnimationUtils.java

+8 −8
Original line number Original line Diff line number Diff line
@@ -216,22 +216,16 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> { 
                });

                });

            }

            }

            alphaAnim.addListener(new AnimatorListenerAdapter() {

            alphaAnim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationCancel(Animator animation) {

                    // If Animation is canceled, we want to ensure UI is reset.

                    view.setAlpha(targetAlpha);

                    view.setTranslationY(targetTranslationY);

                }



                @Override

                @Override

                public void onAnimationEnd(Animator animation) {

                public void onAnimationEnd(Animator animation) {

                    view.setAlpha(targetAlpha);

                    if (endRunnable != null) {

                    if (endRunnable != null) {

                        endRunnable.run();

                        endRunnable.run();

                    }

                    }

                }

                }

            });

            });

            alphaAnim.start();

            alphaAnim.start();

            startTranslationYAnimation(view, delay, duration, appearing ? 0 : translationY,

            startTranslationYAnimation(view, delay, duration, targetTranslationY,

                    interpolator, animatorListener);

                    interpolator, animatorListener);

        }

        }

    }

    }
@@ -265,6 +259,12 @@ public class AppearAnimationUtils implements AppearAnimationCreator<View> { 
        if (listener != null) {

        if (listener != null) {

            translationAnim.addListener(listener);

            translationAnim.addListener(listener);

        }

        }

        translationAnim.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                view.setTranslationY(endTranslationY);

            }

        });

        translationAnim.start();

        translationAnim.start();

    }

    }