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

Commit 8b3ac9b8 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix multi-display nav bar tests on large screen devices" into... 

Merge "Fix multi-display nav bar tests on large screen devices" into tm-qpr-dev am: cfaad7ff am: e38b3413

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



Change-Id: Ib3039e39ccf2d76f2b2638817b391b04cde86e1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7df18174 e38b3413

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

+1 −5
Original line number Diff line number Diff line
@@ -302,10 +302,6 @@ public class NavigationBarController implements 
     */

    @VisibleForTesting

    void createNavigationBar(Display display, Bundle savedState, RegisterStatusBarResult result) {

        if (initializeTaskbarIfNecessary()) {

            return;

        }



        if (display == null) {

            return;

        }
@@ -315,7 +311,7 @@ public class NavigationBarController implements 


        // We may show TaskBar on the default display for large screen device. Don't need to create

        // navigation bar for this case.

        if (mIsTablet && isOnDefaultDisplay) {

        if (isOnDefaultDisplay && initializeTaskbarIfNecessary()) {

            return;

        }