Merge changes from topic "presubmit-am-77a112383a4743c3a21b2621a549dd36" into sc-v2-dev-plus-aosp am: 3f86aa4948
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17074337 Change-Id: I415e70865e5c8cc6d724b8119a9e44b341177bd2
This commit is contained in:
@@ -73,6 +73,7 @@ import android.annotation.Nullable;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.ActivityInfo;
|
import android.content.pm.ActivityInfo;
|
||||||
import android.content.res.Configuration;
|
import android.content.res.Configuration;
|
||||||
|
import android.graphics.Color;
|
||||||
import android.graphics.Point;
|
import android.graphics.Point;
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.os.Debug;
|
import android.os.Debug;
|
||||||
@@ -3807,7 +3808,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
|
|||||||
private void setTaskBackgroundColor(@ColorInt int backgroundColor) {
|
private void setTaskBackgroundColor(@ColorInt int backgroundColor) {
|
||||||
TaskDisplayArea taskDisplayArea = getTaskDisplayArea();
|
TaskDisplayArea taskDisplayArea = getTaskDisplayArea();
|
||||||
|
|
||||||
if (taskDisplayArea != null) {
|
if (taskDisplayArea != null && backgroundColor != Color.TRANSPARENT) {
|
||||||
taskDisplayArea.setBackgroundColor(backgroundColor);
|
taskDisplayArea.setBackgroundColor(backgroundColor);
|
||||||
|
|
||||||
// Atomic counter to make sure the clearColor callback is only called one.
|
// Atomic counter to make sure the clearColor callback is only called one.
|
||||||
|
|||||||
Reference in New Issue
Block a user