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

Commit 2dce465d authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic540ac5b1c7a5578b8f589d1b73204754b58e7d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6874c76 a2076c8b

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

+3 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            // Split entering background.

            wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                    true /* setReparentLeafTaskIfRelaunch */);

            if (!mMainStage.mRootTaskInfo.isSleeping && !mSideStage.mRootTaskInfo.isSleeping) {

                wct.setForceTranslucent(mRootTaskInfo.token, true);

            }

        } else {

            wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,

                    false /* setReparentLeafTaskIfRelaunch */);