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

Commit 92dc9fe9 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Attach/Detatch EdgeBackGestureHandler only once on Taskbar... 

Merge "Attach/Detatch EdgeBackGestureHandler only once on Taskbar init/destroy" into sc-v2-dev am: 8abc42e0

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

Change-Id: Idf245389e5ea7bade5e4d23e69ddd74d12ae60ec
parents 8a868c18 8abc42e0

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

+0 −16
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
    private int mDisabledFlags;

    private @WindowVisibleState int mTaskBarWindowState = WINDOW_STATE_SHOWING;

    private @Behavior int mBehavior;

    private boolean mTaskbarVisible = false;



    @Inject

    public TaskbarDelegate(Context context) {
@@ -98,7 +97,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
        mNavigationModeController.removeListener(this);

        mNavigationBarA11yHelper.removeA11yEventListener(mNavA11yEventListener);

        mEdgeBackGestureHandler.onNavBarDetached();

        mTaskbarVisible = false;

    }



    public void init(int displayId) {
@@ -109,7 +107,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
                mNavigationModeController.addListener(this));

        mNavigationBarA11yHelper.registerA11yEventListener(mNavA11yEventListener);

        mEdgeBackGestureHandler.onNavBarAttached();

        mTaskbarVisible = true;

        // Set initial state for any listeners

        updateSysuiFlags();

    }
@@ -184,19 +181,6 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, 
        }

    }



    @Override

    public void onTaskbarStatusUpdated(boolean visible, boolean stashed) {

        if (mTaskbarVisible == visible) {

            return;

        }

        mTaskbarVisible = visible;

        if (visible) {

            mEdgeBackGestureHandler.onNavBarAttached();

        } else {

            mEdgeBackGestureHandler.onNavBarDetached();

        }

    }



    @Override

    public void onNavigationModeChanged(int mode) {

        mEdgeBackGestureHandler.onNavigationModeChanged(mode);