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

Merge "Bouncer shouldn't be translated when occluded" into pi-dev

Browse Source 
am: 553fc8b8e0

Change-Id: I74a1d7a75b4b632cdacc6fbbe8cd88cea449f0f1
This commit is contained in:
Lucas Dupin
2018-05-21 18:13:27 -07:00
committed by android-build-merger
parent fe5aa5bb54 553fc8b8e0
commit 76bb2c0b59
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4715,7 +4715,7 @@ public class StatusBar extends SystemUI implements DemoMode,
// Bouncer needs the front scrim when it's on top of an activity, // Bouncer needs the front scrim when it's on top of an activity,
// tapping on a notification, editing QS or being dismissed by // tapping on a notification, editing QS or being dismissed by
// FLAG_DISMISS_KEYGUARD_ACTIVITY. // FLAG_DISMISS_KEYGUARD_ACTIVITY.
ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming() ScrimState state = mIsOccluded || mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
|| mStatusBarKeyguardViewManager.willDismissWithAction() || mStatusBarKeyguardViewManager.willDismissWithAction()
|| mStatusBarKeyguardViewManager.isFullscreenBouncer() ? || mStatusBarKeyguardViewManager.isFullscreenBouncer() ?
ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER; ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;

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

@@ -169,7 +169,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
// • Full-screen user switcher is displayed. // • Full-screen user switcher is displayed.
if (mNotificationPanelView.isUnlockHintRunning()) { if (mNotificationPanelView.isUnlockHintRunning()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN); mBouncer.setExpansion(KeyguardBouncer.EXPANSION_HIDDEN);
} else if (mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed() } else if (mOccluded || mBouncer.willDismissWithAction() || mBouncer.isShowingScrimmed()
|| mStatusBar.isFullScreenUserSwitcherState()) { || mStatusBar.isFullScreenUserSwitcherState()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE); mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
} else if (mShowing && !mDozing) { } else if (mShowing && !mDozing) {

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

@@ -162,6 +162,14 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
verify(mBouncer, never()).show(eq(false), eq(false)); verify(mBouncer, never()).show(eq(false), eq(false));
} }
@Test
public void onPanelExpansionChanged_neverTranslatesBouncerWhenOccluded() {
mStatusBarKeyguardViewManager.setOccluded(true /* occluded */, false /* animate */);
mStatusBarKeyguardViewManager.onPanelExpansionChanged(0.5f /* expansion */,
true /* tracking */);
verify(mBouncer, never()).setExpansion(eq(0.5f));
}
private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager { private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {
public TestableStatusBarKeyguardViewManager(Context context, public TestableStatusBarKeyguardViewManager(Context context,