Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename LockscreenTargetFilter.

Browse Source 
This change renames LockscreenTargetFilter to
LockscreenAndDreamTargetFilter, because it is now shared between both
the lockscreen and dream surfaces.

Bug: 233580657
Test: atest LockscreenAndDreamTargetFilterTest
Change-Id: Ic6998a0cdc57fb42f1d4b414ad0305d721df0180
This commit is contained in:
Darrell Shi
2022-08-03 20:41:48 +00:00
parent 0471f7b84a
commit 5f02150a8b
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
@@ -69,4 +69,4 @@ abstract class SmartspaceModule {
abstract fun bindSmartspacePrecondition(
lockscreenPrecondition: LockscreenPrecondition?
): SmartspacePrecondition?
}
}

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

@@ -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,
@@ -149,4 +149,4 @@ class LockscreenTargetFilter @Inject constructor(
listeners.forEach { it.onCriteriaChanged() }
}
}
}

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

@@ -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)
@@ -146,4 +146,4 @@ class LockscreenTargetFilterTest : SysuiTestCase() {
verify(listener).onCriteriaChanged()
}
}
}