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

Commit d8df6614 authored by Winson Chung's avatar Winson Chung
Browse files

Workaround for delayed reset-transform transaction 

- Attempt to mask an issue with the menu window resizing before the
  reset transform is applied by delaying the start of the menu
  animation after the pip expands and extending the duration of
  the animation.

Bug: 160826797
Test: Expand pip repeatedly
Change-Id: I1f8d524f2221b8bfb18a918b192b3e1c20dd6030
parent 0811c474

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