Merge "Avoid gestures occuring on AOD2." into sc-dev (709b6ce9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/classifier/FalsingCollectorImpl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ class FalsingCollectorImpl implements FalsingCollector {

		@Override
		public void onTouchEvent(MotionEvent ev) {
		if (!mKeyguardStateController.isShowing()) {
		if (!mKeyguardStateController.isShowing() \|\| mStatusBarStateController.isDozing()) {
		avoidGesture();
		return;
		}

+17 −1

Original line number	Diff line number	Diff line
		@@ -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));
		}