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

Commit 7050b6e2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[CS] Update NavBar to call KeyguardStateController not CentralSurfaces. 

Bug: 277764509
Test: turn on 3 button nav & receive incoming call while device is
locked -> try tapping on home button and verify touch is blocked & log
statement is logged
Test: turn on 3 button nav & receive incoming call while device is
*un*locked -> verify home button tap works, touch not blocked
Test: atest NavigationBarTest

Change-Id: I1f2a3ef07509e1c920c2b0640f3c3f774d53c781
parent 1c3989f7

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+6 −7
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ import com.android.systemui.recents.Recents; 
import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.settings.UserContextProvider;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.shared.navigationbar.RegionSamplingHelper;

import com.android.systemui.shared.recents.utilities.Utilities;
@@ -156,6 +155,7 @@ import com.android.systemui.statusbar.phone.CentralSurfaces; 
import com.android.systemui.statusbar.phone.LightBarController;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.DeviceConfigProxy;

import com.android.systemui.util.ViewController;

import com.android.wm.shell.back.BackAnimation;
@@ -200,7 +200,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    private final StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private final SysUiState mSysUiFlagsContainer;

    private final Lazy<Optional<CentralSurfaces>> mCentralSurfacesOptionalLazy;

    private final ShadeController mShadeController;

    private final KeyguardStateController mKeyguardStateController;

    private final ShadeViewController mShadeViewController;

    private final NotificationRemoteInputManager mNotificationRemoteInputManager;

    private final OverviewProxyService mOverviewProxyService;
@@ -262,7 +262,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    @VisibleForTesting

    public int mDisplayId;

    private boolean mIsOnDefaultDisplay;

    public boolean mHomeBlockedThisTouch;

    private boolean mHomeBlockedThisTouch;



    /**

     * When user is QuickSwitching between apps of different orientations, we'll draw a fake
@@ -531,7 +531,6 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    @Inject

    NavigationBar(

            NavigationBarView navigationBarView,

            ShadeController shadeController,

            NavigationBarFrame navigationBarFrame,

            @Nullable Bundle savedState,

            @DisplayId Context context,
@@ -550,6 +549,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
            Optional<Pip> pipOptional,

            Optional<Recents> recentsOptional,

            Lazy<Optional<CentralSurfaces>> centralSurfacesOptionalLazy,

            KeyguardStateController keyguardStateController,

            ShadeViewController shadeViewController,

            NotificationRemoteInputManager notificationRemoteInputManager,

            NotificationShadeDepthController notificationShadeDepthController,
@@ -585,7 +585,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mSysUiFlagsContainer = sysUiFlagsContainer;

        mCentralSurfacesOptionalLazy = centralSurfacesOptionalLazy;

        mShadeController = shadeController;

        mKeyguardStateController = keyguardStateController;

        mShadeViewController = shadeViewController;

        mNotificationRemoteInputManager = notificationRemoteInputManager;

        mOverviewProxyService = overviewProxyService;
@@ -1326,8 +1326,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
                mHomeBlockedThisTouch = false;

                if (mTelecomManagerOptional.isPresent()

                        && mTelecomManagerOptional.get().isRinging()) {

                    if (centralSurfacesOptional.map(CentralSurfaces::isKeyguardShowing)

                            .orElse(false)) {

                    if (mKeyguardStateController.isShowing()) {

                        Log.i(TAG, "Ignoring HOME; there's a ringing incoming call. " +

                                "No heads up");

                        mHomeBlockedThisTouch = true;

packages/SystemUI/tests/src/com/android/systemui/navigationbar/NavigationBarTest.java

+55 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.HOME_B 
import static com.android.systemui.navigationbar.NavigationBar.NavBarActionEvent.NAVBAR_ASSIST_LONGPRESS;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SCREEN_PINNING;



import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;
@@ -93,7 +95,6 @@ import com.android.systemui.settings.FakeDisplayTracker; 
import com.android.systemui.settings.UserContextProvider;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeViewController;

import com.android.systemui.shared.rotation.RotationButtonController;

import com.android.systemui.shared.system.TaskStackChangeListeners;
@@ -329,6 +330,58 @@ public class NavigationBarTest extends SysuiTestCase { 
        verify(mHandler, times(1)).removeCallbacks(any());

    }



    @Test

    public void onHomeTouch_isRinging_keyguardShowing_touchBlocked() {

        when(mTelecomManager.isRinging()).thenReturn(true);

        when(mKeyguardStateController.isShowing()).thenReturn(true);



        boolean result = mNavigationBar.onHomeTouch(

                mNavigationBar.getView(),

                    MotionEvent.obtain(

                    /*downTime=*/SystemClock.uptimeMillis(),

                    /*eventTime=*/SystemClock.uptimeMillis(),

                    /*action=*/MotionEvent.ACTION_DOWN,

                    0, 0, 0));



        assertThat(result).isTrue();



        // Verify subsequent touches are also blocked

        boolean nextTouchEvent = mNavigationBar.onHomeTouch(

                mNavigationBar.getView(),

                MotionEvent.obtain(

                        /*downTime=*/SystemClock.uptimeMillis(),

                        /*eventTime=*/SystemClock.uptimeMillis(),

                        /*action=*/MotionEvent.ACTION_MOVE,

                        0, 0, 0));

        assertThat(nextTouchEvent).isTrue();

    }



    @Test

    public void onHomeTouch_isRinging_keyguardNotShowing_touchNotBlocked() {

        when(mTelecomManager.isRinging()).thenReturn(true);

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



        boolean result = mNavigationBar.onHomeTouch(

                mNavigationBar.getView(),

                MotionEvent.obtain(

                        /*downTime=*/SystemClock.uptimeMillis(),

                        /*eventTime=*/SystemClock.uptimeMillis(),

                        /*action=*/MotionEvent.ACTION_DOWN,

                        0, 0, 0));



        assertThat(result).isFalse();



        // Verify subsequent touches are also not blocked

        boolean nextTouchEvent = mNavigationBar.onHomeTouch(

                mNavigationBar.getView(),

                MotionEvent.obtain(

                        /*downTime=*/SystemClock.uptimeMillis(),

                        /*eventTime=*/SystemClock.uptimeMillis(),

                        /*action=*/MotionEvent.ACTION_MOVE,

                        0, 0, 0));

        assertThat(nextTouchEvent).isFalse();

    }



    @Test

    public void testRegisteredWithUserTracker() {

        mNavigationBar.init();
@@ -468,7 +521,6 @@ public class NavigationBarTest extends SysuiTestCase { 
        when(deviceProvisionedController.isDeviceProvisioned()).thenReturn(true);

        return spy(new NavigationBar(

                mNavigationBarView,

                mock(ShadeController.class),

                mNavigationBarFrame,

                null,

                context,
@@ -487,6 +539,7 @@ public class NavigationBarTest extends SysuiTestCase { 
                Optional.of(mock(Pip.class)),

                Optional.of(mock(Recents.class)),

                () -> Optional.of(mCentralSurfaces),

                mKeyguardStateController,

                mock(ShadeViewController.class),

                mock(NotificationRemoteInputManager.class),

                mock(NotificationShadeDepthController.class),