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

Commit 38cd5741 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Send ACTION_UP event when aborting a key gesture" into sc-dev am: 2acdea2e 

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

Change-Id: I6d9979981c0a53d9337730e42af589e7dcfaf24d
parents 8f9df578 2acdea2e

packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonView.java

+3 −0
Original line number Diff line number Diff line
@@ -436,6 +436,9 @@ public class KeyButtonView extends ImageView implements ButtonInterface { 
    @Override

    public void abortCurrentGesture() {

        Log.d("b/63783866", "KeyButtonView.abortCurrentGesture");

        if (mCode != KeyEvent.KEYCODE_UNKNOWN) {

            sendEvent(KeyEvent.ACTION_UP, KeyEvent.FLAG_CANCELED);

        }

        setPressed(false);

        mRipple.abortDelayedRipple();

        mGestureAborted = true;

packages/SystemUI/tests/src/com/android/systemui/navigationbar/buttons/KeyButtonViewTest.java

+18 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.view.KeyEvent.KEYCODE_0; 
import static android.view.KeyEvent.KEYCODE_APP_SWITCH;

import static android.view.KeyEvent.KEYCODE_BACK;

import static android.view.KeyEvent.KEYCODE_HOME;

import static android.view.KeyEvent.KEYCODE_UNKNOWN;



import static com.android.systemui.navigationbar.buttons.KeyButtonView.NavBarButtonEvent.NAVBAR_BACK_BUTTON_LONGPRESS;

import static com.android.systemui.navigationbar.buttons.KeyButtonView.NavBarButtonEvent.NAVBAR_BACK_BUTTON_TAP;
@@ -134,6 +135,22 @@ public class KeyButtonViewTest extends SysuiTestCase { 
        checkmetrics(KEYCODE_0, ACTION_UP, 0, null);

    }



    @Test

    public void testEventInjectedOnAbortGesture() {

        mKeyButtonView.setCode(KEYCODE_HOME);

        mKeyButtonView.abortCurrentGesture();

        verify(mInputManager, times(1))

                .injectInputEvent(any(KeyEvent.class), any(Integer.class));

    }



    @Test

    public void testNoEventInjectedOnAbortUnknownGesture() {

        mKeyButtonView.setCode(KEYCODE_UNKNOWN);

        mKeyButtonView.abortCurrentGesture();

        verify(mInputManager, never())

                .injectInputEvent(any(KeyEvent.class), any(Integer.class));

    }



    private void checkmetrics(int code, int action, int flag,

            KeyButtonView.NavBarButtonEvent expected) {

        mKeyButtonView.setCode(code);