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

Commit 77b66223 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delay gesture processing in FalsingCollector." into sc-dev

parents cfab1005 efcf043f

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

+7 −2
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ import android.view.MotionEvent; 
import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.sensors.ProximitySensor;

import com.android.systemui.util.sensors.ThresholdSensor;

import com.android.systemui.util.time.SystemClock;
@@ -50,6 +52,7 @@ class FalsingCollectorImpl implements FalsingCollector { 
    private final ProximitySensor mProximitySensor;

    private final StatusBarStateController mStatusBarStateController;

    private final KeyguardStateController mKeyguardStateController;

    private final DelayableExecutor mMainExecutor;

    private final SystemClock mSystemClock;



    private int mState;
@@ -89,7 +92,8 @@ class FalsingCollectorImpl implements FalsingCollector { 
    FalsingCollectorImpl(FalsingDataProvider falsingDataProvider, FalsingManager falsingManager,

            KeyguardUpdateMonitor keyguardUpdateMonitor, HistoryTracker historyTracker,

            ProximitySensor proximitySensor, StatusBarStateController statusBarStateController,

            KeyguardStateController keyguardStateController, SystemClock systemClock) {

            KeyguardStateController keyguardStateController,

            @Main DelayableExecutor mainExecutor, SystemClock systemClock) {

        mFalsingDataProvider = falsingDataProvider;

        mFalsingManager = falsingManager;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;
@@ -97,6 +101,7 @@ class FalsingCollectorImpl implements FalsingCollector { 
        mProximitySensor = proximitySensor;

        mStatusBarStateController = statusBarStateController;

        mKeyguardStateController = keyguardStateController;

        mMainExecutor = mainExecutor;

        mSystemClock = systemClock;
@@ -276,7 +281,7 @@ class FalsingCollectorImpl implements FalsingCollector { 


    @Override

    public void onMotionEventComplete() {

        mFalsingDataProvider.onMotionEventComplete();

        mMainExecutor.executeDelayed(mFalsingDataProvider::onMotionEventComplete , 50);

    }



    @Override

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

+5 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.sensors.ProximitySensor;

import com.android.systemui.util.sensors.ThresholdSensor;

import com.android.systemui.util.time.FakeSystemClock;
@@ -65,6 +66,8 @@ public class FalsingCollectorImplTest extends SysuiTestCase { 
    private SysuiStatusBarStateController mStatusBarStateController;

    @Mock

    private KeyguardStateController mKeyguardStateController;

    private final FakeSystemClock mFakeSystemClock = new FakeSystemClock();

    private final FakeExecutor mFakeExecutor = new FakeExecutor(mFakeSystemClock);



    @Before

    public void setUp() {
@@ -75,7 +78,8 @@ public class FalsingCollectorImplTest extends SysuiTestCase { 


        mFalsingCollector = new FalsingCollectorImpl(mFalsingDataProvider, mFalsingManager,

                mKeyguardUpdateMonitor, mHistoryTracker, mProximitySensor,

                mStatusBarStateController, mKeyguardStateController, new FakeSystemClock());

                mStatusBarStateController, mKeyguardStateController, mFakeExecutor,

                mFakeSystemClock);

    }



    @Test