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

Merge "Hold onto occluded change until it's committed" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-23 21:49:00 +00:00
committed by Android (Google) Code Review
parent ff19de5fad 8a8169dae5
commit 0cbdbb64c8
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3341,8 +3341,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mPendingKeyguardOccluded = occluded; mPendingKeyguardOccluded = occluded;
mKeyguardOccludedChanged = true; mKeyguardOccludedChanged = true;
} else { } else {
setKeyguardOccludedLw(occluded, false /* force */, setKeyguardOccludedLw(occluded, false /* transitionStarted */);
false /* transitionStarted */);
} }
} }
@@ -3351,8 +3350,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mKeyguardOccludedChanged) { if (mKeyguardOccludedChanged) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "transition/occluded changed occluded=" if (DEBUG_KEYGUARD) Slog.d(TAG, "transition/occluded changed occluded="
+ mPendingKeyguardOccluded); + mPendingKeyguardOccluded);
if (setKeyguardOccludedLw(mPendingKeyguardOccluded, false /* force */, if (setKeyguardOccludedLw(mPendingKeyguardOccluded, transitionStarted)) {
transitionStarted)) {
return FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_WALLPAPER; return FINISH_LAYOUT_REDO_LAYOUT | FINISH_LAYOUT_REDO_WALLPAPER;
} }
} }
@@ -3601,22 +3599,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
/** /**
* Updates the occluded state of the Keyguard. * Updates the occluded state of the Keyguard immediately via
* {@link com.android.internal.policy.IKeyguardService}.
* *
* @param isOccluded Whether the Keyguard is occluded by another window. * @param isOccluded Whether the Keyguard is occluded by another window.
* @param force notify the occluded status to KeyguardService and update flags even though
* occlude status doesn't change.
* @param transitionStarted {@code true} if keyguard (un)occluded transition started. * @param transitionStarted {@code true} if keyguard (un)occluded transition started.
* @return Whether the flags have changed and we have to redo the layout. * @return Whether the flags have changed and we have to redo the layout.
*/ */
private boolean setKeyguardOccludedLw(boolean isOccluded, boolean force, private boolean setKeyguardOccludedLw(boolean isOccluded, boolean transitionStarted) {
boolean transitionStarted) {
if (DEBUG_KEYGUARD) Slog.d(TAG, "setKeyguardOccluded occluded=" + isOccluded); if (DEBUG_KEYGUARD) Slog.d(TAG, "setKeyguardOccluded occluded=" + isOccluded);
mKeyguardOccludedChanged = false;
if (isKeyguardOccluded() == isOccluded && !force) {
return false;
}
final boolean showing = mKeyguardDelegate.isShowing(); final boolean showing = mKeyguardDelegate.isShowing();
final boolean animate = showing && !isOccluded; final boolean animate = showing && !isOccluded;
// When remote animation is enabled for keyguard (un)occlude transition, KeyguardService // When remote animation is enabled for keyguard (un)occlude transition, KeyguardService
@@ -3624,7 +3615,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// to notify here. // to notify here.
final boolean notify = !WindowManagerService.sEnableRemoteKeyguardOccludeAnimation final boolean notify = !WindowManagerService.sEnableRemoteKeyguardOccludeAnimation
|| !transitionStarted; || !transitionStarted;
if (notify) {
mKeyguardOccludedChanged = false;
mKeyguardDelegate.setOccluded(isOccluded, animate, notify); mKeyguardDelegate.setOccluded(isOccluded, animate, notify);
}
return showing; return showing;
} }