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

Commit a0ec131c authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "[Unfold animation] Move unfold animation background under wallpaper"... 

Merge "[Unfold animation] Move unfold animation background under wallpaper" into udc-dev am: 11979783 am: 98efd348

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



Change-Id: Ib9bcbc6946745e16fef2460446c9992366c1fea7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3a17719 98efd348

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+2 −8
Original line number Diff line number Diff line
@@ -634,14 +634,8 @@ public abstract class WMShellModule { 


    @WMSingleton

    @Provides

    static UnfoldBackgroundController provideUnfoldBackgroundController(

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            Context context

    ) {

        return new UnfoldBackgroundController(

                context,

                rootTaskDisplayAreaOrganizer

        );

    static UnfoldBackgroundController provideUnfoldBackgroundController(Context context) {

        return new UnfoldBackgroundController(context);

    }



    //

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldBackgroundController.java

+1 −9
Original line number Diff line number Diff line
@@ -19,14 +19,12 @@ package com.android.wm.shell.unfold; 
import static android.graphics.Color.blue;

import static android.graphics.Color.green;

import static android.graphics.Color.red;

import static android.view.Display.DEFAULT_DISPLAY;



import android.annotation.NonNull;

import android.content.Context;

import android.view.SurfaceControl;



import com.android.wm.shell.R;

import com.android.wm.shell.RootTaskDisplayAreaOrganizer;



/**

 * Controls background color layer for the unfold animations
@@ -34,15 +32,10 @@ import com.android.wm.shell.RootTaskDisplayAreaOrganizer; 
public class UnfoldBackgroundController {



    private static final int BACKGROUND_LAYER_Z_INDEX = -1;



    private final RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer;

    private final float[] mBackgroundColor;

    private SurfaceControl mBackgroundLayer;



    public UnfoldBackgroundController(

            @NonNull Context context,

            @NonNull RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer) {

        mRootTaskDisplayAreaOrganizer = rootTaskDisplayAreaOrganizer;

    public UnfoldBackgroundController(@NonNull Context context) {

        mBackgroundColor = getBackgroundColor(context);

    }
@@ -57,7 +50,6 @@ public class UnfoldBackgroundController { 
                .setName("app-unfold-background")

                .setCallsite("AppUnfoldTransitionController")

                .setColorLayer();

        mRootTaskDisplayAreaOrganizer.attachToDisplayArea(DEFAULT_DISPLAY, colorLayerBuilder);

        mBackgroundLayer = colorLayerBuilder.build();



        transaction