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

Commit 974f3481 authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Add more setFrameTimeline calls" into main

parents 2db540c5 8ea2cef5

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/animation/WindowAnimator.kt

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.PointF 
import android.graphics.Rect

import android.util.DisplayMetrics

import android.util.TypedValue

import android.view.Choreographer

import android.view.SurfaceControl

import android.view.animation.Interpolator

import android.window.TransitionInfo
@@ -82,6 +83,7 @@ object WindowAnimator { 
                transaction

                    .setPosition(leash, animPos.x, animPos.y)

                    .setScale(leash, animScale, animScale)

                    .setFrameTimeline(Choreographer.getInstance().vsyncId)

                    .apply()

            }

        }

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.Rect; 
import android.os.Handler;

import android.os.IBinder;

import android.util.DisplayMetrics;

import android.view.Choreographer;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.WindowManager.TransitionType;
@@ -184,6 +185,7 @@ public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionH 
                t.setPosition(sc, mPosition.x * (1 - fraction), mPosition.y * (1 - fraction))

                        .setScale(sc, currentScaleX, currentScaleY)

                        .show(sc)

                        .setFrameTimeline(Choreographer.getInstance().getVsyncId())

                        .apply();

            });

            animator.addListener(new AnimatorListenerAdapter() {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/shared/animation/WindowAnimatorTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.ArgumentMatchers.any

import org.mockito.ArgumentMatchers.anyFloat

import org.mockito.ArgumentMatchers.anyLong

import org.mockito.kotlin.argumentCaptor

import org.mockito.kotlin.mock

import org.mockito.kotlin.whenever
@@ -56,6 +57,7 @@ class WindowAnimatorTest { 
        whenever(change.endAbsBounds).thenReturn(END_BOUNDS)

        whenever(transaction.setPosition(any(), anyFloat(), anyFloat())).thenReturn(transaction)

        whenever(transaction.setScale(any(), anyFloat(), anyFloat())).thenReturn(transaction)

        whenever(transaction.setFrameTimeline(anyLong())).thenReturn(transaction)

        whenever(

            transaction.setPosition(

                any(),