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

Merge "Avoid showing bouncer when in a launch transition" into pi-dev

Browse Source 
am: a102591e13

Change-Id: I74f40e19035a1c27f0120d93af23e64a296fbf15
This commit is contained in:
Lucas Dupin
2018-06-13 16:10:23 -07:00
committed by android-build-merger
parent 6d82626ade a102591e13
commit 39f8dee83f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
|| mStatusBar.isFullScreenUserSwitcherState()) { || mStatusBar.isFullScreenUserSwitcherState()) {
mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE); mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);
} else if (mShowing && !mDozing) { } else if (mShowing && !mDozing) {
if (!isWakeAndUnlocking()) { if (!isWakeAndUnlocking() && !mStatusBar.isInLaunchTransition()) {
mBouncer.setExpansion(expansion); mBouncer.setExpansion(expansion);
} }
if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking

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

@@ -177,6 +177,14 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
verify(mBouncer, never()).setExpansion(anyFloat()); verify(mBouncer, never()).setExpansion(anyFloat());
} }
@Test
public void onPanelExpansionChanged_neverTranslatesBouncerWhenLaunchingApp() {
when(mStatusBar.isInLaunchTransition()).thenReturn(true);
mStatusBarKeyguardViewManager.onPanelExpansionChanged(KeyguardBouncer.EXPANSION_VISIBLE,
false /* tracking */);
verify(mBouncer, never()).setExpansion(anyFloat());
}
private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager { private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {
public TestableStatusBarKeyguardViewManager(Context context, public TestableStatusBarKeyguardViewManager(Context context,