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

Commit ab63fe9c authored by Johannes Gallmann's avatar Johannes Gallmann
Browse files

Fix back does not hide keyboard first in bouncer 

Bug: 329840044
Flag: ACONFIG com.android.systemui.predictive_back_animate_bouncer TEAMFOOD
Test: atest StatusBarKeyguardViewManagerTest
Test: Manual, i.e. verifying that keyboard is dismissed with first back swipe and only second back swipe plays bouncer predictive back animation
Change-Id: Id73a2e48ee4ea95b93eb086d733627a206e91a17
parent 69a62d57

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
@@ -607,7 +607,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 */
@@ -622,7 +622,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);
@@ -642,7 +642,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);
@@ -660,7 +660,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);