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

Commit 312124a2 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "[automerger skipped] Merge "Parcel: recycle recycles" into sc-v2-dev...

Merge "[automerger skipped] Merge "Parcel: recycle recycles" into sc-v2-dev am: c4ca84a2 am: b6ac4a05 -s ours am: 80c65156 -s ours" into tm-d1-dev
parents c0dc8bc9 892c941a
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ 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
@@ -317,7 +316,7 @@ public class NavigationBarView extends FrameLayout {
            };

    private final Consumer<Boolean> mNavbarOverlayVisibilityChangeCallback = (visible) -> {
        if (visible && mAutoHideController != null) {
        if (visible) {
            mAutoHideController.touchAutoHide();
        }
        notifyActiveTouchRegions();