commit a2076c8b8e69d6bad2c920925f4cdf2cee1f13b4
author Tony Huang <tonyychuang@google.com> Wed Mar 08 06:04:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 08 06:04:45 2023 +0000
tree 0659346f24bd048e9df7fd99f6bf130d9ed74654
parent 7261d7569c98df4b81a990beae4ba6c93c3c786c
parent 854a170ea7e3719a0c57f5c40d0f9ea35b53582d

Merge "Fix wrong set force translucent when devices locked" into tm-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index c0e4810..2f0cb7e 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -1784,7 +1784,9 @@
             // Split entering background.
             wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
                     true /* setReparentLeafTaskIfRelaunch */);
-            wct.setForceTranslucent(mRootTaskInfo.token, true);
+            if (!mMainStage.mRootTaskInfo.isSleeping && !mSideStage.mRootTaskInfo.isSleeping) {
+                wct.setForceTranslucent(mRootTaskInfo.token, true);
+            }
         } else {
             wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
                     false /* setReparentLeafTaskIfRelaunch */);