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

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

Merge "Fix regression in screen pinning action" into qt-dev

parents 4f8ad9cb 30c62607

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

+1 −0
Original line number Diff line number Diff line
@@ -981,6 +981,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback 
    @Override

    public void onNavigationModeChanged(int mode) {

        mNavBarMode = mode;

        updateScreenPinningGestures();

    }



    public void disableAnimationsDuringHide(long delay) {

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

+2 −0
Original line number Diff line number Diff line
@@ -628,6 +628,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        // as they are used for exiting.

        final boolean pinningActive = ActivityManagerWrapper.getInstance().isScreenPinningActive();

        if (mOverviewProxyService.isEnabled()) {

            // Force disable recents when not in legacy mode

            disableRecent |= !QuickStepContract.isLegacyMode(mNavBarMode);

            if (pinningActive) {

                disableBack = disableHome = false;

            }