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

Merge "Avoid gestures occuring on AOD2." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-23 20:54:19 +00:00
committed by Android (Google) Code Review
parent cce726bea9 b5b43ec3cf
commit 709b6ce952
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java
View File

@@ -257,7 +257,7 @@ class FalsingCollectorImpl implements FalsingCollector {
@Override
public void onTouchEvent(MotionEvent ev) {
if (!mKeyguardStateController.isShowing()) {
if (!mKeyguardStateController.isShowing() || mStatusBarStateController.isDozing()) {
avoidGesture();
return;
}

18
packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingCollectorImplTest.java
View File

@@ -179,7 +179,23 @@ public class FalsingCollectorImplTest extends SysuiTestCase {
mFalsingCollector.onTouchEvent(down);
verify(mFalsingDataProvider, never()).onMotionEvent(any(MotionEvent.class));
// Up event would normally flush the up event.
// Up event would normally flush the up event, but doesn't.
mFalsingCollector.onTouchEvent(up);
verify(mFalsingDataProvider, never()).onMotionEvent(any(MotionEvent.class));
}
@Test
public void testAvoidDozing() {
MotionEvent down = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, 0, 0, 0);
MotionEvent up = MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, 0, 0, 0);
when(mStatusBarStateController.isDozing()).thenReturn(true);
// Nothing passed initially
mFalsingCollector.onTouchEvent(down);
verify(mFalsingDataProvider, never()).onMotionEvent(any(MotionEvent.class));
// Up event would normally flush the up event, but doesn't.
mFalsingCollector.onTouchEvent(up);
verify(mFalsingDataProvider, never()).onMotionEvent(any(MotionEvent.class));
}