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

Commit 1fc42691 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Workaround for delayed reset-transform transaction" into rvc-dev am: 580111f2 

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

Change-Id: I02954c90a316f45f28753d302a990fb67c86738f
parents 1c6427b9 580111f2

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ public class PipMenuActivity extends Activity { 
    private static final int INITIAL_DISMISS_DELAY = 3500;

    private static final int POST_INTERACTION_DISMISS_DELAY = 2000;

    private static final long MENU_FADE_DURATION = 125;

    private static final long MENU_SLOW_FADE_DURATION = 175;

    private static final long MENU_SHOW_ON_EXPAND_START_DELAY = 30;



    private static final float MENU_BACKGROUND_ALPHA = 0.3f;

    private static final float DISMISS_BACKGROUND_ALPHA = 0.6f;
@@ -182,6 +184,7 @@ public class PipMenuActivity extends Activity { 
                    break;

                }

                case MESSAGE_MENU_EXPANDED : {

                    mMenuContainerAnimator.setStartDelay(MENU_SHOW_ON_EXPAND_START_DELAY);

                    mMenuContainerAnimator.start();

                    break;

                }
@@ -400,7 +403,9 @@ public class PipMenuActivity extends Activity { 
                mMenuContainerAnimator.playTogether(dismissAnim, resizeAnim);

            }

            mMenuContainerAnimator.setInterpolator(Interpolators.ALPHA_IN);

            mMenuContainerAnimator.setDuration(MENU_FADE_DURATION);

            mMenuContainerAnimator.setDuration(menuState == MENU_STATE_CLOSE

                    ? MENU_FADE_DURATION

                    : MENU_SLOW_FADE_DURATION);

            if (allowMenuTimeout) {

                mMenuContainerAnimator.addListener(new AnimatorListenerAdapter() {

                    @Override