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

Merge "Class version of getSystemService in UiModeTile" into tm-qpr-dev am: 981a340db7

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

Change-Id: I984fc938ed5b35a7d3c8bd0e28c0ce8658e59fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rasheed Lewis
2022-09-21 21:38:09 +00:00
committed by Automerger Merge Worker
parent 84435238c4 981a340db7
commit 04dfc9777f
2 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java
View File

@@ -81,8 +81,7 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements
super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger, super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,
statusBarStateController, activityStarter, qsLogger); statusBarStateController, activityStarter, qsLogger);
mBatteryController = batteryController; mBatteryController = batteryController;
mUiModeManager = (UiModeManager) host.getUserContext().getSystemService( mUiModeManager = host.getUserContext().getSystemService(UiModeManager.class);
Context.UI_MODE_SERVICE);
mLocationController = locationController; mLocationController = locationController;
configurationController.observe(getLifecycle(), this); configurationController.observe(getLifecycle(), this);
batteryController.observe(getLifecycle(), this); batteryController.observe(getLifecycle(), this);

47
packages/SystemUI/tests/src/com/android/systemui/qs/tiles/UiModeNightTileTest.kt
View File

@@ -21,9 +21,9 @@ import android.content.Context
import android.content.res.Configuration import android.content.res.Configuration
import android.content.res.Resources import android.content.res.Resources
import android.os.Handler import android.os.Handler
import android.test.suitebuilder.annotation.SmallTest
import android.testing.AndroidTestingRunner import android.testing.AndroidTestingRunner
import android.testing.TestableLooper import android.testing.TestableLooper
import androidx.test.filters.SmallTest
import com.android.internal.logging.MetricsLogger import com.android.internal.logging.MetricsLogger
import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.logging.testing.UiEventLoggerFake
import com.android.systemui.R import com.android.systemui.R
@@ -51,28 +51,17 @@ import org.mockito.MockitoAnnotations
@SmallTest @SmallTest
class UiModeNightTileTest : SysuiTestCase() { class UiModeNightTileTest : SysuiTestCase() {
@Mock @Mock private lateinit var mockContext: Context
private lateinit var mockContext: Context @Mock private lateinit var uiModeManager: UiModeManager
@Mock @Mock private lateinit var resources: Resources
private lateinit var uiModeManager: UiModeManager @Mock private lateinit var qsLogger: QSLogger
@Mock @Mock private lateinit var qsHost: QSTileHost
private lateinit var resources: Resources @Mock private lateinit var metricsLogger: MetricsLogger
@Mock @Mock private lateinit var statusBarStateController: StatusBarStateController
private lateinit var qsLogger: QSLogger @Mock private lateinit var activityStarter: ActivityStarter
@Mock @Mock private lateinit var configurationController: ConfigurationController
private lateinit var qsHost: QSTileHost @Mock private lateinit var batteryController: BatteryController
@Mock @Mock private lateinit var locationController: LocationController
private lateinit var metricsLogger: MetricsLogger
@Mock
private lateinit var statusBarStateController: StatusBarStateController
@Mock
private lateinit var activityStarter: ActivityStarter
@Mock
private lateinit var configurationController: ConfigurationController
@Mock
private lateinit var batteryController: BatteryController
@Mock
private lateinit var locationController: LocationController
private val uiEventLogger = UiEventLoggerFake() private val uiEventLogger = UiEventLoggerFake()
private val falsingManager = FalsingManagerFake() private val falsingManager = FalsingManagerFake()
@@ -85,7 +74,7 @@ class UiModeNightTileTest : SysuiTestCase() {
MockitoAnnotations.initMocks(this) MockitoAnnotations.initMocks(this)
testableLooper = TestableLooper.get(this) testableLooper = TestableLooper.get(this)
configuration = Configuration() configuration = Configuration()
mContext.addMockSystemService(Context.UI_MODE_SERVICE, uiModeManager) mContext.addMockSystemService(UiModeManager::class.java, uiModeManager)
`when`(qsHost.context).thenReturn(mockContext) `when`(qsHost.context).thenReturn(mockContext)
`when`(qsHost.userContext).thenReturn(mContext) `when`(qsHost.userContext).thenReturn(mContext)
@@ -93,7 +82,8 @@ class UiModeNightTileTest : SysuiTestCase() {
`when`(resources.configuration).thenReturn(configuration) `when`(resources.configuration).thenReturn(configuration)
`when`(qsHost.uiEventLogger).thenReturn(uiEventLogger) `when`(qsHost.uiEventLogger).thenReturn(uiEventLogger)
tile = UiModeNightTile( tile =
UiModeNightTile(
qsHost, qsHost,
testableLooper.looper, testableLooper.looper,
Handler(testableLooper.looper), Handler(testableLooper.looper),
@@ -104,7 +94,8 @@ class UiModeNightTileTest : SysuiTestCase() {
qsLogger, qsLogger,
configurationController, configurationController,
batteryController, batteryController,
locationController) locationController
)
} }
@Test @Test
@@ -115,7 +106,7 @@ class UiModeNightTileTest : SysuiTestCase() {
tile.handleUpdateState(state, /* arg= */ null) tile.handleUpdateState(state, /* arg= */ null)
assertThat(state.icon) assertThat(state.icon)
.isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_light_dark_theme_icon_on)) .isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_light_dark_theme_icon_on))
} }
@Test @Test
@@ -126,7 +117,7 @@ class UiModeNightTileTest : SysuiTestCase() {
tile.handleUpdateState(state, /* arg= */ null) tile.handleUpdateState(state, /* arg= */ null)
assertThat(state.icon) assertThat(state.icon)
.isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_light_dark_theme_icon_off)) .isEqualTo(QSTileImpl.ResourceIcon.get(R.drawable.qs_light_dark_theme_icon_off))
} }
private fun setNightModeOn() { private fun setNightModeOn() {