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

Simplify scrimmed bouncer condition

Browse Source 
Similar logic existed in StatusBar and StatusBarKeyguardViewManager,
this can lead to errors since it's easy to update one place and forget
about the other.

Test: go/sysui-bouncer-tests
Test: force simPin security mode
Change-Id: I4a22cba5144844cf982f259da13db0c8effbeae6
This commit is contained in:
Lucas Dupin
2018-06-19 10:50:04 -07:00
parent 7f6641b890
commit c516bac0b4
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4722,10 +4722,8 @@ public class StatusBar extends SystemUI implements DemoMode,
// Bouncer needs the front scrim when it's on top of an activity,
// tapping on a notification, editing QS or being dismissed by
// FLAG_DISMISS_KEYGUARD_ACTIVITY.
ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
|| mStatusBarKeyguardViewManager.willDismissWithAction()
|| mStatusBarKeyguardViewManager.isFullscreenBouncer() ?
ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
mScrimController.transitionTo(state);
} else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) {
mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -170,8 +170,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
// • Full-screen user switcher is displayed.
if (mNotificationPanelView.isUnlockHintRunning()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);
} else if (mOccluded || mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed()
|| mStatusBar.isFullScreenUserSwitcherState()) {
} else if (bouncerNeedsScrimming()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
} else if (mShowing && !mDozing) {
if (!isWakeAndUnlocking()) {
@@ -731,12 +730,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
}
}
public boolean willDismissWithAction() {
return mBouncer.willDismissWithAction();
}
public boolean bouncerNeedsScrimming() {
return mBouncer.isShowingScrimmed();
return mOccluded || mBouncer.willDismissWithAction() || mBouncer.needsFullscreenBouncer()
|| mStatusBar.isFullScreenUserSwitcherState() || mBouncer.isShowingScrimmed();
}
public void dump(PrintWriter pw) {