Merge "Fix wrong set force translucent when devices locked" into tm-qpr-dev am: a2076c8b8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21794303 Change-Id: Ic540ac5b1c7a5578b8f589d1b73204754b58e7d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1784,7 +1784,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
|
|||||||
// Split entering background.
|
// Split entering background.
|
||||||
wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
|
wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
|
||||||
true /* setReparentLeafTaskIfRelaunch */);
|
true /* setReparentLeafTaskIfRelaunch */);
|
||||||
|
if (!mMainStage.mRootTaskInfo.isSleeping && !mSideStage.mRootTaskInfo.isSleeping) {
|
||||||
wct.setForceTranslucent(mRootTaskInfo.token, true);
|
wct.setForceTranslucent(mRootTaskInfo.token, true);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
|
wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
|
||||||
false /* setReparentLeafTaskIfRelaunch */);
|
false /* setReparentLeafTaskIfRelaunch */);
|
||||||
|
|||||||
Reference in New Issue
Block a user