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

Commit bbf37a12 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Ignore signals from RecentTasks for frozen task list 

Let Launcher be the one controlling when to
enable/disable edge gesture as well as determining
the current rotation. This is to prevent resetting
the home handle/edge gesture when user swipes up to
overview and exceeds the frozen time out limit.

Fixes: 156053957
Change-Id: Ic79015d358f3a222cec86f3925e00ee978159bba
parent 3d6a1cfb

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

+0 −14
Original line number Diff line number Diff line
@@ -113,16 +113,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 
                }

            };



    private TaskStackChangeListener mTaskStackChangeListener = new TaskStackChangeListener() {

        @Override

        public void onRecentTaskListFrozenChanged(boolean frozen) {

            if (!frozen) {

                mStartingQuickstepRotation = -1;

                mDisabledForQuickstep = false;

            }

        }

    };



    private final ContentObserver mFixedRotationObserver = new ContentObserver(

            new Handler(Looper.getMainLooper())) {

        @Override
@@ -287,12 +277,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa 


    private void setRotationCallbacks(boolean enable) {

        if (enable) {

            ActivityManagerWrapper.getInstance().registerTaskStackListener(

                    mTaskStackChangeListener);

            mOverviewProxyService.addCallback(mQuickSwitchListener);

        } else {

            ActivityManagerWrapper.getInstance().unregisterTaskStackListener(

                    mTaskStackChangeListener);

            mOverviewProxyService.removeCallback(mQuickSwitchListener);

        }

    }

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

+1 −11
Original line number Diff line number Diff line
@@ -305,14 +305,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }

    };



    private TaskStackChangeListener mTasksFrozenListener = new TaskStackChangeListener() {

        @Override

        public void onRecentTaskListFrozenChanged(boolean frozen) {

            mFrozenTasks = frozen;

            orientSecondaryHomeHandle();

        }

    };



    private NavigationBarTransitions.DarkIntensityListener mOrientationHandleIntensityListener =

            new NavigationBarTransitions.DarkIntensityListener() {

                @Override
@@ -510,7 +502,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }



        initSecondaryHomeHandleForRotation();

        ActivityManagerWrapper.getInstance().registerTaskStackListener(mTasksFrozenListener);

    }



    @Override
@@ -527,7 +518,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
        }

        mOverviewProxyService.removeCallback(mOverviewProxyListener);

        mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);

        ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTasksFrozenListener);

        if (mOrientationHandle != null) {

            resetSecondaryHandle();

            getContext().getSystemService(DisplayManager.class).unregisterDisplayListener(this);
@@ -594,7 +584,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
            return;

        }



        if (!mFrozenTasks) {

        if (mStartingQuickSwitchRotation == -1) {

            resetSecondaryHandle();

        } else {

            int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation);