Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Send ACTION_UP event when aborting a key gesture" into sc-dev

Browse Source
This commit is contained in:
Miranda Kephart
2021-04-01 14:49:29 +00:00
committed by Android (Google) Code Review
parent 45dbeea371 867b29f8d0
commit 2acdea2e0e
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,6 +436,9 @@ public class KeyButtonView extends ImageView implements ButtonInterface {
@Override @Override
public void abortCurrentGesture() { public void abortCurrentGesture() {
Log.d("b/63783866", "KeyButtonView.abortCurrentGesture"); Log.d("b/63783866", "KeyButtonView.abortCurrentGesture");
if (mCode != KeyEvent.KEYCODE_UNKNOWN) {
sendEvent(KeyEvent.ACTION_UP, KeyEvent.FLAG_CANCELED);
}
setPressed(false); setPressed(false);
mRipple.abortDelayedRipple(); mRipple.abortDelayedRipple();
mGestureAborted = true; mGestureAborted = true;

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

@@ -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_APP_SWITCH;
import static android.view.KeyEvent.KEYCODE_BACK; import static android.view.KeyEvent.KEYCODE_BACK;
import static android.view.KeyEvent.KEYCODE_HOME; 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_LONGPRESS;
import static com.android.systemui.navigationbar.buttons.KeyButtonView.NavBarButtonEvent.NAVBAR_BACK_BUTTON_TAP; import static com.android.systemui.navigationbar.buttons.KeyButtonView.NavBarButtonEvent.NAVBAR_BACK_BUTTON_TAP;
@@ -88,7 +89,7 @@ public class KeyButtonViewTest extends SysuiTestCase {
} }
@Test @Test
public void testLogOverviewPress() { public void testLogOverviewPress() {
checkmetrics(KEYCODE_APP_SWITCH, ACTION_UP, 0, NAVBAR_OVERVIEW_BUTTON_TAP); checkmetrics(KEYCODE_APP_SWITCH, ACTION_UP, 0, NAVBAR_OVERVIEW_BUTTON_TAP);
} }
@@ -134,6 +135,22 @@ public class KeyButtonViewTest extends SysuiTestCase {
checkmetrics(KEYCODE_0, ACTION_UP, 0, null); 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, private void checkmetrics(int code, int action, int flag,
KeyButtonView.NavBarButtonEvent expected) { KeyButtonView.NavBarButtonEvent expected) {
mKeyButtonView.setCode(code); mKeyButtonView.setCode(code);