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

Commit 8446ebd3 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents ce60d851 fa59c210

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ interface ISystemUiProxy { 
    oneway void injectLongPress(int keyCode) = 46;



    /** Injects button press. */

    oneway void injectDoublePress(int keyCode) = 43;

    oneway void injectPress(int keyCode) = 43;



    /** Notifies when taskbar status updated */

    oneway void notifyTaskbarStatus(boolean visible, boolean stashed) = 47;

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+2 −4
Original line number Diff line number Diff line
@@ -322,10 +322,8 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        }



        @Override

        public void injectDoublePress(int keyCode) throws RemoteException {

            verifyCallerAndClearCallingIdentityPostMain("doublePressInjected", () -> {

                sendEvent(KeyEvent.ACTION_DOWN, keyCode);

                sendEvent(KeyEvent.ACTION_UP, keyCode);

        public void injectPress(int keyCode) throws RemoteException {

            verifyCallerAndClearCallingIdentityPostMain("pressInjected", () -> {

                sendEvent(KeyEvent.ACTION_DOWN, keyCode);

                sendEvent(KeyEvent.ACTION_UP, keyCode);

            });

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −6
Original line number Diff line number Diff line
@@ -2380,9 +2380,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mPendingHomeKeyEvent = null;

                    mHandler.removeCallbacks(mHomeDoubleTapTimeoutRunnable);

                    performKeyAction(mHomeDoubleTapAction, event);

                    if (mHomeDoubleTapAction != Action.SLEEP) {

                    mHomeConsumed = true;

                    }

                } else if (mDisplayId == DEFAULT_DISPLAY

                        && (mHomeLongPressAction == Action.APP_SWITCH

                            || mHomeDoubleTapAction == Action.APP_SWITCH)) {
@@ -2400,11 +2398,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    // it should pass this right invocation type.

                    performKeyAction(mHomeLongPressAction, event,

                            AssistUtils.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);

                    if (mHomeLongPressAction != Action.SLEEP) {

                    mHomeConsumed = true;

                }

            }

            }

            return true;

        }