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

Commit f1e8010a authored by Jiaming Liu's avatar Jiaming Liu
Browse files

[Bubble] Fix flicker related to start animation moving view outside display 

If the TaskView is moved outside the display bounds, the appBounds of
the Activity inside the Task window is cropped. This caused flicker
because the appBounds changed between the beginning and ending of the
animation, which triggered app relayout. This change moves the
starting position into the animator instead of moving the view before
the animation to prevent the flicker.

Bug: 424205239
Test: Manual
Flag: EXEMPT bugfix
Change-Id: I42338b5a29e817cdba1924a6290be0b00cb19ccf
parent f33bb495

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java

+5 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.annotation.NonNull;

import android.content.Context;

import android.graphics.Rect;
@@ -44,7 +43,6 @@ import android.view.SurfaceControl; 
import android.widget.FrameLayout;



import androidx.annotation.Nullable;

import androidx.dynamicanimation.animation.FloatPropertyCompat;



import com.android.app.animation.Interpolators;

import com.android.internal.protolog.ProtoLog;
@@ -296,13 +294,13 @@ public class BubbleBarAnimationHelper { 
        prepareForAnimateIn(toBbev);

        final float endTx = toBbev.getTranslationX();

        final float startTx = getSwitchAnimationInitialTx(endTx);

        toBbev.setTranslationX(startTx);

        toBbev.getHandleView().setAlpha(0f);

        toBbev.getHandleView().setHandleInitialColor(fromBbev.getHandleView().getHandleColor());



        toBbev.animateExpansionWhenTaskViewVisible(() -> {

            AnimatorSet switchAnim = new AnimatorSet();

            switchAnim.playTogether(switchOutAnimator(fromBbev), switchInAnimator(toBbev, endTx));

            switchAnim.playTogether(

                    switchOutAnimator(fromBbev), switchInAnimator(toBbev, startTx, endTx));

            switchAnim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {
@@ -354,8 +352,9 @@ public class BubbleBarAnimationHelper { 
        return animator;

    }



    private Animator switchInAnimator(BubbleBarExpandedView bbev, float restingTx) {

        ObjectAnimator positionAnim = ObjectAnimator.ofFloat(bbev, TRANSLATION_X, restingTx);

    private Animator switchInAnimator(BubbleBarExpandedView bbev, float startTx, float restingTx) {

        ObjectAnimator positionAnim =

                ObjectAnimator.ofFloat(bbev, TRANSLATION_X, startTx, restingTx);

        positionAnim.setInterpolator(Interpolators.EMPHASIZED_DECELERATE);

        positionAnim.setStartDelay(SWITCH_IN_ANIM_DELAY);

        positionAnim.setDuration(SWITCH_IN_TX_DURATION);