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

Commit 56891c0c authored by Altaf-Mahdi's avatar Altaf-Mahdi Committed by Steve Kondik
Browse files

SystemUI: unbreak accesibility longpress Overview to unpin 

check to see if were in a locked app so we don't hijack recents

Change-Id: I849349d8983cd2a644948c559dc6e35b5deb8eed
parent 1af5b159

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

+5 −3
Original line number Diff line number Diff line
@@ -4651,12 +4651,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                    activityManager.stopLockTaskModeOnCurrent();

                    // When exiting refresh disabled flags.

                    mNavigationBarView.setDisabledFlags(mDisabled1, true);

                } else if ((NavbarEditor.NAVBAR_BACK.equals(v.getTag()))

                } else if (NavbarEditor.NAVBAR_BACK.equals(v.getTag())

                        && !mNavigationBarView.getRecentsButton().isPressed()) {

                    // If we aren't pressing recents right now then they presses

                    // won't be together, so send the standard long-press action.

                    sendBackLongPress = true;

                } else if ((NavbarEditor.NAVBAR_RECENT.equals(v.getTag()))) {

                } else if (NavbarEditor.NAVBAR_RECENT.equals(v.getTag())

                         && !activityManager.isInLockTaskMode()) {

                    hijackRecentsLongPress = true;

                }

                mLastLockToAppLongPress = time;
@@ -4664,7 +4665,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                // If this is back still need to handle sending the long-press event.

                if (NavbarEditor.NAVBAR_BACK.equals(v.getTag())) {

                    sendBackLongPress = true;

                } else if (NavbarEditor.NAVBAR_RECENT.equals(v.getTag())) {

                } else if (NavbarEditor.NAVBAR_RECENT.equals(v.getTag())

                         && !activityManager.isInLockTaskMode()) {

                    hijackRecentsLongPress = true;

                } else if (isAccessiblityEnabled && activityManager.isInLockTaskMode()) {

                    // When in accessibility mode a long press that is recents (not back)