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

Merge "Do not relayout window whenn pulling shade" into tm-dev

Browse Source
This commit is contained in:
Lucas Dupin
2022-03-26 01:10:05 +00:00
committed by Android (Google) Code Review
parent 210a64ff62 3cc59ab8de
commit 70928042e6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java
View File

@@ -285,14 +285,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
} }
private void applyKeyguardFlags(State state) { private void applyKeyguardFlags(State state) {
final boolean scrimsOccludingWallpaper =
state.mScrimsVisibility == ScrimController.OPAQUE || state.mLightRevealScrimOpaque;
final boolean keyguardOrAod = state.mKeyguardShowing final boolean keyguardOrAod = state.mKeyguardShowing
|| (state.mDozing && mDozeParameters.getAlwaysOn()); || (state.mDozing && mDozeParameters.getAlwaysOn());
if ((keyguardOrAod && !state.mBackdropShowing && !scrimsOccludingWallpaper) if ((keyguardOrAod && !state.mBackdropShowing && !state.mLightRevealScrimOpaque)
|| mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehindOrWillBe()) { || mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehindOrWillBe()) {
// Show the wallpaper if we're on keyguard/AOD and the wallpaper is not occluded by a // Show the wallpaper if we're on keyguard/AOD and the wallpaper is not occluded by a
// solid backdrop or scrim. Also, show it if we are currently animating between the // solid backdrop. Also, show it if we are currently animating between the
// keyguard and the surface behind the keyguard - we want to use the wallpaper as a // keyguard and the surface behind the keyguard - we want to use the wallpaper as a
// backdrop for this animation. // backdrop for this animation.
mLpChanged.flags |= LayoutParams.FLAG_SHOW_WALLPAPER; mLpChanged.flags |= LayoutParams.FLAG_SHOW_WALLPAPER;

8
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImplTest.java
View File

@@ -155,14 +155,16 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
} }
@Test @Test
public void attach_scrimHidesWallpaper() { public void attach_scrimDoesntHideWallpaper() {
when(mKeyguardViewMediator.isShowingAndNotOccluded()).thenReturn(true); when(mKeyguardViewMediator.isShowingAndNotOccluded()).thenReturn(true);
mNotificationShadeWindowController.attach(); mNotificationShadeWindowController.attach();
clearInvocations(mWindowManager); clearInvocations(mWindowManager);
mNotificationShadeWindowController.setScrimsVisibility(ScrimController.OPAQUE); mNotificationShadeWindowController.setScrimsVisibility(ScrimController.OPAQUE);
verify(mWindowManager).updateViewLayout(any(), mLayoutParameters.capture()); // The scrim used to remove the wallpaper flag, but this causes a relayout.
assertThat((mLayoutParameters.getValue().flags & FLAG_SHOW_WALLPAPER) == 0).isTrue(); // Instead, we're not relying on SurfaceControl#setOpaque on
// NotificationShadeDepthController.
verify(mWindowManager, never()).updateViewLayout(any(), mLayoutParameters.capture());
} }
@Test @Test