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

Commit bc675148 authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge "Rename LockscreenTargetFilter." into tm-qpr-dev

parents 7f1d9514 5f02150a

packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceModule.kt

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.smartspace.dagger 
import com.android.systemui.plugins.BcSmartspaceDataPlugin

import com.android.systemui.smartspace.SmartspacePrecondition

import com.android.systemui.smartspace.SmartspaceTargetFilter

import com.android.systemui.smartspace.filters.LockscreenTargetFilter

import com.android.systemui.smartspace.filters.LockscreenAndDreamTargetFilter

import com.android.systemui.smartspace.preconditions.LockscreenPrecondition

import dagger.Binds

import dagger.BindsOptionalOf
@@ -61,7 +61,7 @@ abstract class SmartspaceModule { 
    @Binds

    @Named(LOCKSCREEN_SMARTSPACE_TARGET_FILTER)

    abstract fun provideLockscreenSmartspaceTargetFilter(

        filter: LockscreenTargetFilter?

        filter: LockscreenAndDreamTargetFilter?

    ): SmartspaceTargetFilter?



    @Binds

packages/SystemUI/src/com/android/systemui/smartspace/filters/LockscreenTargetFilter.kt→packages/SystemUI/src/com/android/systemui/smartspace/filters/LockscreenAndDreamTargetFilter.kt

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ import java.util.concurrent.Executor 
import javax.inject.Inject



/**

 * {@link SmartspaceTargetFilter} for smartspace targets that show above the lockscreen.

 * {@link SmartspaceTargetFilter} for smartspace targets that show above the lockscreen and dreams.

 */

class LockscreenTargetFilter @Inject constructor(

class LockscreenAndDreamTargetFilter @Inject constructor(

    private val secureSettings: SecureSettings,

    private val userTracker: UserTracker,

    private val execution: Execution,

packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenTargetFilterTest.kt→packages/SystemUI/tests/src/com/android/systemui/smartspace/LockscreenAndDreamTargetFilterTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -27,13 +27,14 @@ import android.testing.TestableLooper 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.settings.UserTracker

import com.android.systemui.smartspace.filters.LockscreenTargetFilter

import com.android.systemui.smartspace.filters.LockscreenAndDreamTargetFilter

import com.android.systemui.util.concurrency.Execution

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.withArgCaptor

import com.android.systemui.util.settings.SecureSettings

import com.google.common.truth.Truth.assertThat

import java.util.concurrent.Executor

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith
@@ -41,18 +42,17 @@ import org.mockito.ArgumentCaptor 
import org.mockito.ArgumentMatchers.anyBoolean

import org.mockito.ArgumentMatchers.anyInt

import org.mockito.Mock

import org.mockito.Mockito.`when`

import org.mockito.Mockito.atLeast

import org.mockito.Mockito.clearInvocations

import org.mockito.Mockito.mock

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when`

import org.mockito.MockitoAnnotations

import java.util.concurrent.Executor



@SmallTest

@TestableLooper.RunWithLooper

@RunWith(AndroidTestingRunner::class)

class LockscreenTargetFilterTest : SysuiTestCase() {

class LockscreenAndDreamTargetFilterTest : SysuiTestCase() {

    @Mock

    private lateinit var secureSettings: SecureSettings
@@ -99,7 +99,7 @@ class LockscreenTargetFilterTest : SysuiTestCase() { 
        `when`(secureSettings

                .getIntForUser(eq(setting) ?: setting, anyInt(), anyInt()))

                .thenReturn(0)

        var filter = LockscreenTargetFilter(secureSettings, userTracker, execution, handler,

        var filter = LockscreenAndDreamTargetFilter(secureSettings, userTracker, execution, handler,

                contentResolver, uiExecution)



        filter.addListener(listener)
@@ -132,7 +132,7 @@ class LockscreenTargetFilterTest : SysuiTestCase() { 
        `when`(secureSettings

                .getIntForUser(eq(setting) ?: setting, anyInt(), anyInt()))

                .thenReturn(0)

        var filter = LockscreenTargetFilter(secureSettings, userTracker, execution, handler,

        var filter = LockscreenAndDreamTargetFilter(secureSettings, userTracker, execution, handler,

                contentResolver, uiExecution)



        filter.addListener(listener)