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

Commit 8585fc73 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes I1678d10e,I0bb309e1 

* changes:
  Clean up back handler from prototracer
  Removing unnecessary code
parents faa0c8d2 469a3084

packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
            }

        }



        Dependency.get(ProtoTracer.class).add(this);

        mLongPressTimeout = Math.min(MAX_LONG_PRESS_TIMEOUT,

                ViewConfiguration.getLongPressTimeout());
@@ -286,6 +285,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
     */

    public void onNavBarAttached() {

        mIsAttached = true;

        Dependency.get(ProtoTracer.class).add(this);

        mOverviewProxyService.addCallback(mQuickSwitchListener);

        updateIsEnabled();

        startTracking();
@@ -296,6 +296,7 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
     */

    public void onNavBarDetached() {

        mIsAttached = false;

        Dependency.get(ProtoTracer.class).remove(this);

        mOverviewProxyService.removeCallback(mQuickSwitchListener);

        updateIsEnabled();

        stopTracking();

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+0 −6
Original line number Diff line number Diff line
@@ -2477,7 +2477,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
    private final Runnable mCheckBarModes = this::checkBarModes;



    public void setInteracting(int barWindow, boolean interacting) {

        final boolean changing = ((mInteractingWindows & barWindow) != 0) != interacting;

        mInteractingWindows = interacting

                ? (mInteractingWindows | barWindow)

                : (mInteractingWindows & ~barWindow);
@@ -2486,11 +2485,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
        } else {

            mAutoHideController.resumeSuspendedAutoHide();

        }

        // manually dismiss the volume panel when interacting with the nav bar

        if (changing && interacting && barWindow == StatusBarManager.WINDOW_NAVIGATION_BAR) {

            mNavigationBarController.touchAutoDim(mDisplayId);

            dismissVolumeDialog();

        }

        checkBarModes();

    }