Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65bcb4b0 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Merge "Do not expand NPV when unoccluding with bouncer" into qt-dev am:... 

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

Change-Id: Ia9cd7a339007c2fbccb19b0a3dbfd7f3453eaf8e
parents 123aece8 2d4b6286

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

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            // by a FLAG_DISMISS_KEYGUARD_ACTIVITY.

            reset(isOccluding /* hideBouncerWhenShowing*/);

        }

        if (animate && !occluded && mShowing) {

        if (animate && !occluded && mShowing && !mBouncer.isShowing()) {

            mStatusBar.animateKeyguardUnoccluding();

        }

    }

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

+12 −0
Original line number Diff line number Diff line
@@ -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,