Merge "Small follow up lint fixes for ag/17071393" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f16b5fb33f
@@ -1,12 +1,13 @@
|
|||||||
package com.android.systemui.statusbar.phone
|
package com.android.systemui.statusbar.phone
|
||||||
|
|
||||||
import android.annotation.IdRes
|
|
||||||
import android.testing.AndroidTestingRunner
|
import android.testing.AndroidTestingRunner
|
||||||
import android.testing.TestableLooper
|
import android.testing.TestableLooper
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.WindowInsets
|
import android.view.WindowInsets
|
||||||
import android.view.WindowManagerPolicyConstants
|
import android.view.WindowManagerPolicyConstants
|
||||||
|
import androidx.annotation.AnyRes
|
||||||
|
import androidx.annotation.IdRes
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
import androidx.constraintlayout.widget.ConstraintSet
|
import androidx.constraintlayout.widget.ConstraintSet
|
||||||
import androidx.test.filters.SmallTest
|
import androidx.test.filters.SmallTest
|
||||||
@@ -72,8 +73,6 @@ class NotificationQSContainerControllerTest : SysuiTestCase() {
|
|||||||
private lateinit var taskbarVisibilityCallback: OverviewProxyListener
|
private lateinit var taskbarVisibilityCallback: OverviewProxyListener
|
||||||
private lateinit var windowInsetsCallback: Consumer<WindowInsets>
|
private lateinit var windowInsetsCallback: Consumer<WindowInsets>
|
||||||
|
|
||||||
private val testableResources = mContext.orCreateTestableResources
|
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
fun setup() {
|
fun setup() {
|
||||||
MockitoAnnotations.initMocks(this)
|
MockitoAnnotations.initMocks(this)
|
||||||
@@ -105,7 +104,7 @@ class NotificationQSContainerControllerTest : SysuiTestCase() {
|
|||||||
windowInsetsCallback = windowInsetsCallbackCaptor.value
|
windowInsetsCallback = windowInsetsCallbackCaptor.value
|
||||||
}
|
}
|
||||||
|
|
||||||
fun overrideResource(@IdRes id: Int, value: Any) {
|
private fun overrideResource(@AnyRes id: Int, value: Any) {
|
||||||
mContext.orCreateTestableResources.addOverride(id, value)
|
mContext.orCreateTestableResources.addOverride(id, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user