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

Merge "Merge "Do not expand NPV when unoccluding with bouncer" into qt-dev am: 0e9667a356" into qt-dev-plus-aosp

Browse Source 
am: 2d4b628673

Change-Id: Ia9cd7a339007c2fbccb19b0a3dbfd7f3453eaf8e
This commit is contained in:
Lucas Dupin
2019-05-02 18:08:52 -07:00
committed by android-build-merger
parent 123aece81d 2d4b628673
commit 65bcb4b011
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyFloat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.clearInvocations;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@@ -196,6 +197,17 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
verify(mBouncer, never()).setExpansion(anyFloat());
}
@Test
public void setOccluded_animatesPanelExpansion_onlyIfBouncerHidden() {
mStatusBarKeyguardViewManager.setOccluded(false /* occluded */, true /* animated */);
verify(mStatusBar).animateKeyguardUnoccluding();
when(mBouncer.isShowing()).thenReturn(true);
clearInvocations(mStatusBar);
mStatusBarKeyguardViewManager.setOccluded(false /* occluded */, true /* animated */);
verify(mStatusBar, never()).animateKeyguardUnoccluding();
}
private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {
public TestableStatusBarKeyguardViewManager(Context context,