Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Unfold animation] Move unfold animation background under wallpaper" into udc-dev

Browse Source
This commit is contained in:
Nick Chameyev
2023-04-25 15:10:00 +00:00
committed by Android (Google) Code Review
parent 8a62046969 cde805e995
commit 1197978325
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
//

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

@@ -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