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

Commit cbf94cb4 authored by Justin Weir's avatar Justin Weir Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE" into tm-qpr-dev am: 7ade0ddd 

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



Change-Id: Id89fec8482d40ecc9eab64161e9d58fb542f048a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6902391c 7ade0ddd

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

+4 −2
Original line number Diff line number Diff line
@@ -1290,8 +1290,10 @@ public class NavigationBar extends ViewController<NavigationBarView> implements 
    }



    private void onVerticalChanged(boolean isVertical) {

        mCentralSurfacesOptionalLazy.get().ifPresent(statusBar ->

                statusBar.getNotificationPanelViewController().setQsScrimEnabled(!isVertical));

        Optional<CentralSurfaces> cs = mCentralSurfacesOptionalLazy.get();

        if (cs.isPresent() && cs.get().getNotificationPanelViewController() != null) {

            cs.get().getNotificationPanelViewController().setQsScrimEnabled(!isVertical);

        }

    }



    private boolean onNavigationTouch(View v, MotionEvent event) {