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

Commit 14e79502 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid gestures occuring on AOD2." into sc-dev am: 709b6ce9 

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

Change-Id: I488876b22215c31af820838b0c2b71f1f5cdc360
parents 1d976889 709b6ce9

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;

        }

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

+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));

    }