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

Merge "Forcing closing QS when going from SHADE_LOCKED to KEYGUARD" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-14 17:38:31 +00:00
committed by Android (Google) Code Review
parent 4b452106b0 f1984df1f3
commit 0933f38b45
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java
View File

@@ -40,6 +40,7 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_N
import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED;
import static com.android.systemui.statusbar.StatusBarState.KEYGUARD; import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;
import static com.android.systemui.statusbar.StatusBarState.SHADE; import static com.android.systemui.statusbar.StatusBarState.SHADE;
import static com.android.systemui.statusbar.StatusBarState.SHADE_LOCKED;
import static com.android.systemui.statusbar.VibratorHelper.TOUCH_VIBRATION_ATTRIBUTES; import static com.android.systemui.statusbar.VibratorHelper.TOUCH_VIBRATION_ATTRIBUTES;
import static com.android.systemui.statusbar.notification.stack.StackStateAnimator.ANIMATION_DURATION_FOLD_TO_AOD; import static com.android.systemui.statusbar.notification.stack.StackStateAnimator.ANIMATION_DURATION_FOLD_TO_AOD;
import static com.android.systemui.util.DumpUtilsKt.asIndenting; import static com.android.systemui.util.DumpUtilsKt.asIndenting;
@@ -5480,6 +5481,15 @@ public final class NotificationPanelViewController implements Dumpable {
mBarState = statusBarState; mBarState = statusBarState;
mKeyguardShowing = keyguardShowing; mKeyguardShowing = keyguardShowing;
boolean fromShadeToKeyguard = statusBarState == KEYGUARD
&& (oldState == SHADE || oldState == SHADE_LOCKED);
if (mSplitShadeEnabled && fromShadeToKeyguard) {
// user can go to keyguard from different shade states and closing animation
// may not fully run - we always want to make sure we close QS when that happens
// as we never need QS open in fresh keyguard state
closeQs();
}
if (oldState == KEYGUARD && (goingToFullShade if (oldState == KEYGUARD && (goingToFullShade
|| statusBarState == StatusBarState.SHADE_LOCKED)) { || statusBarState == StatusBarState.SHADE_LOCKED)) {
@@ -5499,27 +5509,12 @@ public final class NotificationPanelViewController implements Dumpable {
mKeyguardStatusBarViewController.animateKeyguardStatusBarIn(); mKeyguardStatusBarViewController.animateKeyguardStatusBarIn();
mNotificationStackScrollLayoutController.resetScrollPosition(); mNotificationStackScrollLayoutController.resetScrollPosition();
// Only animate header if the header is visible. If not, it will partially
// animate out
// the top of QS
if (!mQsExpanded) {
// TODO(b/185683835) Nicer clipping when using new spacial model
if (mSplitShadeEnabled) {
mQs.animateHeaderSlidingOut();
}
}
} else { } else {
// this else branch means we are doing one of: // this else branch means we are doing one of:
// - from KEYGUARD to SHADE (but not fully expanded as when swiping from the top) // - from KEYGUARD to SHADE (but not fully expanded as when swiping from the top)
// - from SHADE to KEYGUARD // - from SHADE to KEYGUARD
// - from SHADE_LOCKED to SHADE // - from SHADE_LOCKED to SHADE
// - getting notified again about the current SHADE or KEYGUARD state // - getting notified again about the current SHADE or KEYGUARD state
if (mSplitShadeEnabled && oldState == SHADE && statusBarState == KEYGUARD) {
// user can go to keyguard from different shade states and closing animation
// may not fully run - we always want to make sure we close QS when that happens
// as we never need QS open in fresh keyguard state
closeQs();
}
final boolean animatingUnlockedShadeToKeyguard = oldState == SHADE final boolean animatingUnlockedShadeToKeyguard = oldState == SHADE
&& statusBarState == KEYGUARD && statusBarState == KEYGUARD
&& mScreenOffAnimationController.isKeyguardShowDelayed(); && mScreenOffAnimationController.isKeyguardShowDelayed();

11
packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerTest.java
View File

@@ -1102,6 +1102,17 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase {
mStatusBarStateController.setState(KEYGUARD); mStatusBarStateController.setState(KEYGUARD);
assertThat(mNotificationPanelViewController.isQsExpanded()).isEqualTo(false);
assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isEqualTo(false);
}
@Test
public void testLockedSplitShadeTransitioningToKeyguard_closesQS() {
enableSplitShade(true);
mStatusBarStateController.setState(SHADE_LOCKED);
mNotificationPanelViewController.setQsExpanded(true);
mStatusBarStateController.setState(KEYGUARD);
assertThat(mNotificationPanelViewController.isQsExpanded()).isEqualTo(false); assertThat(mNotificationPanelViewController.isQsExpanded()).isEqualTo(false);
assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isEqualTo(false); assertThat(mNotificationPanelViewController.isQsExpandImmediate()).isEqualTo(false);