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

Commit d2eb9dda authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Check for nullable AutoHideController" into tm-dev am: 97276bc1 am: c0dc8bc9 

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



Change-Id: I3bfa2bb248c9e9cc61d82a58d36078760a7c0d07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5411a243 c0dc8bc9

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

+2 −1
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ public class NavigationBarView extends FrameLayout { 
    private boolean mDeadZoneConsuming = false;

    private final NavigationBarTransitions mBarTransitions;

    private final OverviewProxyService mOverviewProxyService;

    @Nullable

    private AutoHideController mAutoHideController;



    // performs manual animation in sync with layout transitions
@@ -316,7 +317,7 @@ public class NavigationBarView extends FrameLayout { 
            };



    private final Consumer<Boolean> mNavbarOverlayVisibilityChangeCallback = (visible) -> {

        if (visible) {

        if (visible && mAutoHideController != null) {

            mAutoHideController.touchAutoHide();

        }

        notifyActiveTouchRegions();