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

Commit 9ff10b86 authored by Alex Florescu's avatar Alex Florescu Committed by Android (Google) Code Review
Browse files

Merge "Fix test when running on large screen devices" into sc-v2-dev

parents b7edaae1 6269ac83

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class NavigationBarController implements Callbacks, 
    private final TaskbarDelegate mTaskbarDelegate;

    private final NotificationShadeDepthController mNotificationShadeDepthController;

    private int mNavMode;

    private boolean mIsTablet;

    @VisibleForTesting boolean mIsTablet;

    private final UserTracker mUserTracker;



    /** A displayId - nav bar maps. */

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

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ public class NavigationBarControllerTest extends SysuiTestCase { 


    @Test

    public void testCreateNavigationBarsIncludeDefaultTrue() {

        // Tablets may be using taskbar and the logic is different

        mNavigationBarController.mIsTablet = false;

        doNothing().when(mNavigationBarController).createNavigationBar(any(), any(), any());



        mNavigationBarController.createNavigationBars(true, null);