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

Commit c0dc8bc9 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 

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



Change-Id: Ia054a39b023bc66e979bddd0890b57a79422dfac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb1e7e93 97276bc1

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

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

    private boolean mDeadZoneConsuming = false;

    private final NavigationBarTransitions mBarTransitions;

    private final NavigationBarTransitions mBarTransitions;

    private final OverviewProxyService mOverviewProxyService;

    private final OverviewProxyService mOverviewProxyService;

    @Nullable

    private AutoHideController mAutoHideController;

    private AutoHideController mAutoHideController;





    // performs manual animation in sync with layout transitions

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

            };





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

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

        if (visible) {

        if (visible && mAutoHideController != null) {

            mAutoHideController.touchAutoHide();

            mAutoHideController.touchAutoHide();

        }

        }

        notifyActiveTouchRegions();

        notifyActiveTouchRegions();