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

Commit ed19cdfd authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix back does not hide keyboard first in bouncer" into main

parents 8c3b2b5a ab63fe9c

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

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
            ViewRootImpl viewRoot = getViewRootImpl();

            if (viewRoot != null) {

                viewRoot.getOnBackInvokedDispatcher().registerOnBackInvokedCallback(

                        OnBackInvokedDispatcher.PRIORITY_OVERLAY, mOnBackInvokedCallback);

                        OnBackInvokedDispatcher.PRIORITY_DEFAULT, mOnBackInvokedCallback);

                mIsBackCallbackRegistered = true;

            } else {

                if (DEBUG) {

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

+4 −4
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        /* verify that a predictive back callback is registered when the bouncer becomes visible */

        mBouncerExpansionCallback.onVisibilityChanged(true);

        verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback(

                eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY),

                eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT),

                mBackCallbackCaptor.capture());



        /* verify that the same callback is unregistered when the bouncer becomes invisible */
@@ -621,7 +621,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        mBouncerExpansionCallback.onVisibilityChanged(true);

        /* capture the predictive back callback during registration */

        verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback(

                eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY),

                eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT),

                mBackCallbackCaptor.capture());



        when(mPrimaryBouncerInteractor.isFullyShowing()).thenReturn(true);
@@ -641,7 +641,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        mBouncerExpansionCallback.onVisibilityChanged(true);

        /* capture the predictive back callback during registration */

        verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback(

                eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY),

                eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT),

                mBackCallbackCaptor.capture());

        assertTrue(mBackCallbackCaptor.getValue() instanceof OnBackAnimationCallback);
@@ -659,7 +659,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        mBouncerExpansionCallback.onVisibilityChanged(true);

        /* capture the predictive back callback during registration */

        verify(mOnBackInvokedDispatcher).registerOnBackInvokedCallback(

                eq(OnBackInvokedDispatcher.PRIORITY_OVERLAY),

                eq(OnBackInvokedDispatcher.PRIORITY_DEFAULT),

                mBackCallbackCaptor.capture());

        assertTrue(mBackCallbackCaptor.getValue() instanceof OnBackAnimationCallback);