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

Commit 09695993 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Lock free animations (1/2)"

parents ef204717 21c39a77

core/java/android/view/SurfaceControl.java

+31 −0
Original line number Diff line number Diff line
@@ -18,11 +18,18 @@ package android.view; 


import static android.view.Surface.ROTATION_270;

import static android.view.Surface.ROTATION_90;

import static android.graphics.Matrix.MSCALE_X;

import static android.graphics.Matrix.MSCALE_Y;

import static android.graphics.Matrix.MSKEW_X;

import static android.graphics.Matrix.MSKEW_Y;

import static android.graphics.Matrix.MTRANS_X;

import static android.graphics.Matrix.MTRANS_Y;



import android.annotation.Size;

import android.graphics.Bitmap;

import android.graphics.GraphicBuffer;

import android.graphics.PixelFormat;

import android.graphics.Matrix;

import android.graphics.Rect;

import android.graphics.Region;

import android.os.IBinder;
@@ -862,6 +869,22 @@ public class SurfaceControl implements Parcelable { 
        }

    }



    /**

     * Sets the transform and position of a {@link SurfaceControl} from a 3x3 transformation matrix.

     *

     * @param matrix The matrix to apply.

     * @param float9 An array of 9 floats to be used to extract the values from the matrix.

     */

    public void setMatrix(Matrix matrix, float[] float9) {

        checkNotReleased();

        matrix.getValues(float9);

        synchronized (SurfaceControl.class) {

            sGlobalTransaction.setMatrix(this, float9[MSCALE_X], float9[MSKEW_Y],

                    float9[MSKEW_X], float9[MSCALE_Y]);

            sGlobalTransaction.setPosition(this, float9[MTRANS_X], float9[MTRANS_Y]);

        }

    }



    public void setWindowCrop(Rect crop) {

        checkNotReleased();

        synchronized (SurfaceControl.class) {
@@ -1348,6 +1371,14 @@ public class SurfaceControl implements Parcelable { 
            return this;

        }



        public Transaction setMatrix(SurfaceControl sc, Matrix matrix, float[] float9) {

            matrix.getValues(float9);

            setMatrix(sc, float9[MSCALE_X], float9[MSKEW_Y],

                    float9[MSKEW_X], float9[MSCALE_Y]);

            setPosition(sc, float9[MTRANS_X], float9[MTRANS_Y]);

            return this;

        }



        public Transaction setWindowCrop(SurfaceControl sc, Rect crop) {

            sc.checkNotReleased();

            if (crop != null) {

core/java/com/android/internal/graphics/SfVsyncFrameCallbackProvider.java

+9 −1
Original line number Diff line number Diff line
@@ -26,7 +26,15 @@ import android.view.Choreographer; 
 */

public final class SfVsyncFrameCallbackProvider implements AnimationFrameCallbackProvider {



    private final Choreographer mChoreographer = Choreographer.getSfInstance();

    private final Choreographer mChoreographer;



    public SfVsyncFrameCallbackProvider() {

        mChoreographer = Choreographer.getSfInstance();

    }



    public SfVsyncFrameCallbackProvider(Choreographer choreographer) {

        mChoreographer = choreographer;

    }



    @Override

    public void postFrameCallback(Choreographer.FrameCallback callback) {

services/core/java/com/android/server/AnimationThread.java

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ import android.os.Handler; 
import android.os.Trace;



/**

 * Thread for handling all window animations, or anything that's directly impacting animations like

 * starting windows or traversals.

 * Thread for handling all legacy window animations, or anything that's directly impacting

 * animations like starting windows or traversals.

 */

public final class AnimationThread extends ServiceThread {

    private static AnimationThread sInstance;

services/core/java/com/android/server/display/DisplayManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import com.android.server.LocalServices; 
import com.android.server.SystemService;

import com.android.server.UiThread;

import com.android.server.wm.WindowManagerInternal;

import com.android.server.wm.SurfaceAnimationThread;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -292,6 +293,8 @@ public final class DisplayManagerService extends SystemService { 
                Process.THREAD_GROUP_TOP_APP);

        Process.setThreadGroupAndCpuset(AnimationThread.get().getThreadId(),

                Process.THREAD_GROUP_TOP_APP);

        Process.setThreadGroupAndCpuset(SurfaceAnimationThread.get().getThreadId(),

                Process.THREAD_GROUP_TOP_APP);

    }



    @Override

services/core/java/com/android/server/wm/AnimationAdapter.java

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.server.wm;



import android.annotation.ColorInt;

import android.graphics.Point;

import android.view.SurfaceControl;

import android.view.SurfaceControl.Transaction;

import android.view.animation.Animation;



import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;



/**

 * Interface that describes an animation and bridges the animation start to the component

 * responsible for running the animation.

 */

interface AnimationAdapter {



    /**

     * @return Whether we should detach the wallpaper during the animation.

     * @see Animation#setDetachWallpaper

     */

    boolean getDetachWallpaper();



    /**

     * @return The background color behind the animation.

     */

    @ColorInt int getBackgroundColor();



    /**

     * Requests to start the animation.

     *

     * @param animationLeash The surface to run the animation on. See {@link SurfaceAnimator} for an

     *                       overview of the mechanism. This surface needs to be released by the

     *                       component running the animation after {@code finishCallback} has been

     *                       invoked, or after the animation was cancelled.

     * @param t The Transaction to apply the initial frame of the animation.

     * @param finishCallback The callback to be invoked when the animation has finished.

     */

    void startAnimation(SurfaceControl animationLeash, Transaction t,

            OnAnimationFinishedCallback finishCallback);



    /**

     * Called when the animation that was started with {@link #startAnimation} was cancelled by the

     * window manager.

     *

     * @param animationLeash The leash passed to {@link #startAnimation}.

     */

    void onAnimationCancelled(SurfaceControl animationLeash);



    /**

     * @return The approximate duration of the animation, in milliseconds.

     */

    long getDurationHint();

}