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

Commit 5de38774 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "[LockScreen] Update bar state in NPVC." into tm-dev am: 468ccad0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18565167



Change-Id: I8f145ec00020d090192651563434b5e54996ccfb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96c0e56b 468ccad0

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

+1 −0
Original line number Diff line number Diff line
@@ -4842,6 +4842,7 @@ public class NotificationPanelViewController extends PanelViewController { 
            mFragmentService.getFragmentHostManager(mView)

                            .addTagListener(QS.TAG, mFragmentListener);

            mStatusBarStateController.addCallback(mStatusBarStateListener);

            mStatusBarStateListener.onStateChanged(mStatusBarStateController.getState());

            mConfigurationController.addCallback(mConfigurationListener);

            // Theme might have changed between inflating this view and attaching it to the

            // window, so

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

+13 −0
Original line number Diff line number Diff line
@@ -1143,6 +1143,19 @@ public class NotificationPanelViewControllerTest extends SysuiTestCase { 
        assertThat(mNotificationPanelViewController.isQsTracking()).isFalse();

    }



    @Test

    public void testOnAttachRefreshStatusBarState() {

        mStatusBarStateController.setState(KEYGUARD);

        when(mKeyguardStateController.isKeyguardFadingAway()).thenReturn(false);

        for (View.OnAttachStateChangeListener listener : mOnAttachStateChangeListeners) {

            listener.onViewAttachedToWindow(mView);

        }

        verify(mKeyguardStatusViewController).setKeyguardStatusViewVisibility(

                KEYGUARD/*statusBarState*/,

                false/*keyguardFadingAway*/,

                false/*goingToFullShade*/, SHADE/*oldStatusBarState*/);

    }



    private static MotionEvent createMotionEvent(int x, int y, int action) {

        return MotionEvent.obtain(

                /* downTime= */ 0, /* eventTime= */ 0, action, x, y, /* metaState= */ 0);