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

Commit ff556e80 authored by William Xiao's avatar William Xiao
Browse files

Disable falsing entirely when lockscreen widgets are showing 

It is difficult to open the notification shade while on the widgets on
lockscreen UI is open due to flasing. The user needs to perform a
gesture that is already checked by falsing in order to enter the page,
so just disable falsing when the hub is open.

Bug: 409682586
Test: atest FalsingCollectorImplTest BrightLineFalsingManagerTest
Flag: com.android.systemui.communal_shade_touch_handling_fixes
Change-Id: I3bc2661aeb852e2adb90547d28fa8d994087b9b0
parent 8274ff1c

packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/BrightLineFalsingManagerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -203,6 +203,13 @@ public class BrightLineFalsingManagerTest extends SysuiTestCase { 
        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();

    }



    @Test

    public void testSkipCommunalHub() {

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isTrue();

        when(mFalsingDataProvider.isShowingCommunalHub()).thenReturn(true);

        assertThat(mBrightLineFalsingManager.isFalseTouch(Classifier.GENERIC)).isFalse();

    }



    @Test

    @DisableFlags(Flags.FLAG_NON_TOUCHSCREEN_DEVICES_BYPASS_FALSING)

    public void testTrackpadGesture() {

packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/FalsingCollectorImplTest.kt

+102 −5
Original line number Diff line number Diff line
@@ -15,14 +15,21 @@ 
 */

package com.android.systemui.classifier



import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.FlagsParameterization

import android.testing.TestableLooper.RunWithLooper

import android.view.KeyEvent

import android.view.MotionEvent

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.communalSceneRepository

import com.android.systemui.communal.domain.interactor.communalInteractor

import com.android.systemui.communal.domain.interactor.communalSceneInteractor

import com.android.systemui.communal.domain.interactor.communalSettingsInteractor

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.concurrency.fakeExecutor

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.dock.DockManager
@@ -30,11 +37,14 @@ import com.android.systemui.dock.dockManager 
import com.android.systemui.dock.fakeDockManager

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

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

import com.android.systemui.scene.data.repository.sceneContainerRepository

import com.android.systemui.scene.domain.interactor.SceneContainerOcclusionInteractor

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.SysuiStatusBarStateController
@@ -43,11 +53,12 @@ import com.android.systemui.statusbar.policy.BatteryController.BatteryStateChang 
import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.testKosmos

import com.android.systemui.user.domain.interactor.SelectedUserInteractor

import com.android.systemui.util.kotlin.JavaAdapter

import com.android.systemui.util.kotlin.javaAdapter

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

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

import com.android.systemui.util.time.fakeSystemClock

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.flowOf

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith
@@ -62,11 +73,13 @@ import org.mockito.kotlin.reset 
import org.mockito.kotlin.times

import org.mockito.kotlin.verify

import org.mockito.kotlin.whenever

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWith(ParameterizedAndroidJunit4::class)

@RunWithLooper(setAsMainLooper = true)

class FalsingCollectorImplTest : SysuiTestCase() {

class FalsingCollectorImplTest(flags: FlagsParameterization) : SysuiTestCase() {

    private var kosmos = testKosmos().useUnconfinedTestDispatcher()



    private val isDeviceEntered = MutableStateFlow(false)
@@ -86,7 +99,6 @@ class FalsingCollectorImplTest : SysuiTestCase() { 
    private var shadeInteractor =

        mock<ShadeInteractor> { on { isQsExpanded } doReturn MutableStateFlow(false) }

    private var batteryController = mock<BatteryController>()

    private var javaAdapter = mock<JavaAdapter>()

    private var selectedUserInteractor = mock<SelectedUserInteractor>()

    private var deviceEntryInteractor =

        mock<DeviceEntryInteractor> { on { isDeviceEntered } doReturn isDeviceEntered }
@@ -113,11 +125,16 @@ class FalsingCollectorImplTest : SysuiTestCase() { 
                fakeSystemClock,

                { selectedUserInteractor },

                { communalInteractor },

                { communalSceneInteractor },

                { deviceEntryInteractor },

                { sceneContainerOcclusionInteractor },

            )

        }



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Before

    fun setUp() {

        kosmos.underTest.init()
@@ -458,4 +475,84 @@ class FalsingCollectorImplTest : SysuiTestCase() { 
            underTest.onA11yAction()

            verify(falsingDataProvider).onA11yAction()

        }



    @Test

    @EnableFlags(Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES)

    @DisableSceneContainer

    fun testCommunalShowingChanged_dataProviderUpdated() =

        kosmos.runTest {

            // Communal is enabled.

            communalSettingsInteractor.setSuppressionReasons(emptyList())



            communalSceneRepository.changeScene(CommunalScenes.Blank)

            verify(falsingDataProvider).isShowingCommunalHub = false



            communalSceneRepository.changeScene(CommunalScenes.Communal)

            verify(falsingDataProvider).isShowingCommunalHub = true

        }



    @Test

    @EnableFlags(Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES)

    @EnableSceneContainer

    fun testCommunalShowingChanged_dataProviderUpdated_sceneContainer() =

        kosmos.runTest {

            // Communal is enabled.

            communalSettingsInteractor.setSuppressionReasons(emptyList())



            sceneContainerRepository.setTransitionState(

                flowOf(ObservableTransitionState.Idle(Scenes.Lockscreen))

            )

            verify(falsingDataProvider).isShowingCommunalHub = false



            sceneContainerRepository.setTransitionState(

                flowOf(ObservableTransitionState.Idle(Scenes.Communal))

            )

            verify(falsingDataProvider).isShowingCommunalHub = true

        }



    @Test

    @EnableFlags(Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES)

    @DisableSceneContainer

    fun testCommunalShowingChanged_hubShowing_sessionEnds() =

        kosmos.runTest {

            // Communal is enabled.

            communalSettingsInteractor.setSuppressionReasons(emptyList())

            // Session is started.

            underTest.onScreenTurningOn()

            verify(falsingDataProvider).onSessionStarted()



            // Communal shows.

            communalSceneRepository.changeScene(CommunalScenes.Communal)



            // Session ends.

            verify(falsingDataProvider).onSessionEnd()

        }



    @Test

    @EnableFlags(Flags.FLAG_COMMUNAL_SHADE_TOUCH_HANDLING_FIXES)

    @EnableSceneContainer

    fun testCommunalShowingChanged_hubShowing_sessionEnds_sceneContainer() =

        kosmos.runTest {

            // Communal is enabled.

            communalSettingsInteractor.setSuppressionReasons(emptyList())

            // Session is started.

            underTest.onScreenTurningOn()

            verify(falsingDataProvider).onSessionStarted()



            // Communal shows.

            sceneContainerRepository.setTransitionState(

                flowOf(ObservableTransitionState.Idle(Scenes.Communal))

            )



            // Session ends.

            verify(falsingDataProvider).onSessionEnd()

        }



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -395,7 +395,8 @@ public class BrightLineFalsingManager implements FalsingManager { 
                || mDataProvider.isFromTrackpad()

                || mDataProvider.isFromKeyboard()

                || !mDataProvider.isTouchScreenSource()

                || mDataProvider.isUnfolded();

                || mDataProvider.isUnfolded()

                || mDataProvider.isShowingCommunalHub();

    }



    @Override

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

+9 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; 
import com.android.keyguard.KeyguardUpdateMonitorCallback;

import com.android.systemui.Flags;

import com.android.systemui.communal.domain.interactor.CommunalInteractor;

import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor;

import com.android.systemui.dagger.SysUISingleton;

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

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor;
@@ -87,6 +88,7 @@ class FalsingCollectorImpl implements FalsingCollector { 
    private final KeyguardStateController mKeyguardStateController;

    private final Lazy<ShadeInteractor> mShadeInteractorLazy;

    private final Lazy<CommunalInteractor> mCommunalInteractorLazy;

    private final Lazy<CommunalSceneInteractor> mCommunalSceneInteractorLazy;

    private final BatteryController mBatteryController;

    private final DockManager mDockManager;

    private final DelayableExecutor mMainExecutor;
@@ -178,6 +180,7 @@ class FalsingCollectorImpl implements FalsingCollector { 
            SystemClock systemClock,

            Lazy<SelectedUserInteractor> userInteractor,

            Lazy<CommunalInteractor> communalInteractorLazy,

            Lazy<CommunalSceneInteractor> communalSceneInteractorLazy,

            Lazy<DeviceEntryInteractor> deviceEntryInteractor,

            Lazy<SceneContainerOcclusionInteractor> sceneContainerOcclusionInteractor) {

        mFalsingDataProvider = falsingDataProvider;
@@ -195,6 +198,7 @@ class FalsingCollectorImpl implements FalsingCollector { 
        mSystemClock = systemClock;

        mUserInteractor = userInteractor;

        mCommunalInteractorLazy = communalInteractorLazy;

        mCommunalSceneInteractorLazy = communalSceneInteractorLazy;

        mDeviceEntryInteractor = deviceEntryInteractor;

        mSceneContainerOcclusionInteractor = sceneContainerOcclusionInteractor;

    }
@@ -227,10 +231,11 @@ class FalsingCollectorImpl implements FalsingCollector { 
                this::onQsExpansionChanged

        );

        final CommunalInteractor communalInteractor = mCommunalInteractorLazy.get();

        final CommunalSceneInteractor communalSceneInteractor = mCommunalSceneInteractorLazy.get();

        mJavaAdapter.alwaysCollectFlow(

                BooleanFlowOperators.INSTANCE.allOf(

                        communalInteractor.isCommunalEnabled(),

                        communalInteractor.isCommunalShowing()),

                        communalSceneInteractor.isIdleOnCommunal()),

                this::onShowingCommunalHubChanged

        );
@@ -273,6 +278,9 @@ class FalsingCollectorImpl implements FalsingCollector { 
    private void onShowingCommunalHubChanged(boolean isShowing) {

        logDebug("REAL: onShowingCommunalHubChanged(" + isShowing + ")");

        mShowingCommunalHub = isShowing;

        if (Flags.communalShadeTouchHandlingFixes()) {

            mFalsingDataProvider.setShowingCommunalHub(isShowing);

        }

        updateSessionActive();

    }

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

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ public class FalsingDataProvider { 
    private boolean mDropLastEvent;

    private boolean mJustUnlockedWithFace;

    private boolean mA11YAction;

    private boolean mShowingCommunalHub;



    @Inject

    public FalsingDataProvider(
@@ -476,6 +477,14 @@ public class FalsingDataProvider { 
        mSessionListeners.forEach(SessionListener::onSessionEnded);

    }



    public boolean isShowingCommunalHub() {

        return mShowingCommunalHub;

    }



    void setShowingCommunalHub(boolean showingCommunalHub) {

        mShowingCommunalHub = showingCommunalHub;

    }



    public boolean isJustUnlockedWithFace() {

        return mJustUnlockedWithFace;

    }