Merge "[automerger skipped] Merge "Parcel: recycle recycles" into sc-v2-dev am: c4ca84a2b3 am: b6ac4a054b -s ours am: 80c65156ce -s ours" into tm-d1-dev

This commit is contained in:
Automerger Merge Worker
2022-04-06 17:31:42 +00:00
committed by Android (Google) Code Review

View File

@@ -143,7 +143,6 @@ 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
@@ -317,7 +316,7 @@ public class NavigationBarView extends FrameLayout {
}; };
private final Consumer<Boolean> mNavbarOverlayVisibilityChangeCallback = (visible) -> { private final Consumer<Boolean> mNavbarOverlayVisibilityChangeCallback = (visible) -> {
if (visible && mAutoHideController != null) { if (visible) {
mAutoHideController.touchAutoHide(); mAutoHideController.touchAutoHide();
} }
notifyActiveTouchRegions(); notifyActiveTouchRegions();