Merge "Check for nullable AutoHideController" into tm-dev

This commit is contained in:
Vinit Nayak
2022-04-06 17:27:52 +00:00
committed by Android (Google) Code Review

View File

@@ -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();