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

Merge changes I9881453b,I57fa88c6 into stage-aosp-master am: c227f6f1e0

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

Change-Id: I6e2c1091ad8df9a58368db0ac024bb91a97fab3f
This commit is contained in:
Pablo Gamito
2022-02-17 23:41:14 +00:00
committed by Automerger Merge Worker
parent 42b52280e7 c227f6f1e0
commit d049803340
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -975,18 +975,23 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
Color color = Color.valueOf(colorInt); Color color = Color.valueOf(colorInt);
mColorLayerCounter++; mColorLayerCounter++;
getPendingTransaction() // Only apply the background color if the TDA is actually attached and has a valid surface
.setColor(mSurfaceControl, new float[]{color.red(), color.green(), color.blue()}); // to set the background color on. We still want to keep track of the background color state
// even if we are not showing it for when/if the TDA is reattached and gets a valid surface
scheduleAnimation(); if (mSurfaceControl != null) {
getPendingTransaction()
.setColor(mSurfaceControl,
new float[]{color.red(), color.green(), color.blue()});
scheduleAnimation();
}
} }
void clearBackgroundColor() { void clearBackgroundColor() {
mColorLayerCounter--; mColorLayerCounter--;
// Only clear the color layer if we have received the same amounts of clear as set // Only clear the color layer if we have received the same amounts of clear as set
// requests. // requests and TDA has a non null surface control (i.e. is attached)
if (mColorLayerCounter == 0) { if (mColorLayerCounter == 0 && mSurfaceControl != null) {
getPendingTransaction().unsetColor(mSurfaceControl); getPendingTransaction().unsetColor(mSurfaceControl);
scheduleAnimation(); scheduleAnimation();
} }