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

Commit 34314b76 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Central Surfaces] Make PulsingGestureListener a singleton." into udc-qpr-dev am: 52fcb00a 

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



Change-Id: Id7e209e49ab78dbf732e130a0fc2494faceaa7f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bda7ad88 52fcb00a

packages/SystemUI/src/com/android/systemui/shade/PulsingGestureListener.kt

+2 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.provider.Settings 
import android.view.GestureDetector

import android.view.MotionEvent

import com.android.systemui.Dumpable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dock.DockManager

import com.android.systemui.dump.DumpManager

import com.android.systemui.plugins.FalsingManager
@@ -29,7 +30,6 @@ import com.android.systemui.plugins.FalsingManager.LOW_PENALTY 
import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.settings.UserTracker

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent

import com.android.systemui.tuner.TunerService

import com.android.systemui.tuner.TunerService.Tunable

import java.io.PrintWriter
@@ -44,9 +44,8 @@ import javax.inject.Inject 
 * screen is still ON and not in the true AoD display state. When the device is in the true AoD

 * display state, wake-ups are handled by [com.android.systemui.doze.DozeSensors].

 */

@CentralSurfacesComponent.CentralSurfacesScope

@SysUISingleton

class PulsingGestureListener @Inject constructor(

        private val notificationShadeWindowView: NotificationShadeWindowView,

        private val falsingManager: FalsingManager,

        private val dockManager: DockManager,

        private val powerInteractor: PowerInteractor,

packages/SystemUI/tests/src/com/android/systemui/shade/PulsingGestureListenerTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ import org.mockito.Mockito.`when` as whenever 
@RunWithLooper(setAsMainLooper = true)

@SmallTest

class PulsingGestureListenerTest : SysuiTestCase() {

    @Mock

    private lateinit var view: NotificationShadeWindowView

    @Mock

    private lateinit var dockManager: DockManager

    @Mock
@@ -87,7 +85,6 @@ class PulsingGestureListenerTest : SysuiTestCase() { 
        powerRepository = FakePowerRepository()



        underTest = PulsingGestureListener(

                view,

                falsingManager,

                dockManager,

                PowerInteractor(