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

Commit df47abe3 authored by Rasheed Lewis's avatar Rasheed Lewis
Browse files

Class version of getSystemService in UiModeTile 

Fixes: 247805261
Test: atest UiModeNightTileTest
Change-Id: I418b58cee899ce71cf775a1f4b234659ff10c6a8
parent 56cf35b2

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

+1 −2
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements 
        super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,

                statusBarStateController, activityStarter, qsLogger);

        mBatteryController = batteryController;

        mUiModeManager = (UiModeManager) host.getUserContext().getSystemService(

                Context.UI_MODE_SERVICE);

        mUiModeManager = host.getUserContext().getSystemService(UiModeManager.class);

        mLocationController = locationController;

        configurationController.observe(getLifecycle(), this);

        batteryController.observe(getLifecycle(), this);

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

+19 −28
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import android.content.Context 
import android.content.res.Configuration

import android.content.res.Resources

import android.os.Handler

import android.test.suitebuilder.annotation.SmallTest

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper

import androidx.test.filters.SmallTest

import com.android.internal.logging.MetricsLogger

import com.android.internal.logging.testing.UiEventLoggerFake

import com.android.systemui.R
@@ -51,28 +51,17 @@ import org.mockito.MockitoAnnotations 
@SmallTest

class UiModeNightTileTest : SysuiTestCase() {



    @Mock

    private lateinit var mockContext: Context

    @Mock

    private lateinit var uiModeManager: UiModeManager

    @Mock

    private lateinit var resources: Resources

    @Mock

    private lateinit var qsLogger: QSLogger

    @Mock

    private lateinit var qsHost: QSTileHost

    @Mock

    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

    @Mock private lateinit var mockContext: Context

    @Mock private lateinit var uiModeManager: UiModeManager

    @Mock private lateinit var resources: Resources

    @Mock private lateinit var qsLogger: QSLogger

    @Mock private lateinit var qsHost: QSTileHost

    @Mock 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 falsingManager = FalsingManagerFake()
@@ -85,7 +74,7 @@ class UiModeNightTileTest : SysuiTestCase() { 
        MockitoAnnotations.initMocks(this)

        testableLooper = TestableLooper.get(this)

        configuration = Configuration()

        mContext.addMockSystemService(Context.UI_MODE_SERVICE, uiModeManager)

        mContext.addMockSystemService(UiModeManager::class.java, uiModeManager)



        `when`(qsHost.context).thenReturn(mockContext)

        `when`(qsHost.userContext).thenReturn(mContext)
@@ -93,7 +82,8 @@ class UiModeNightTileTest : SysuiTestCase() { 
        `when`(resources.configuration).thenReturn(configuration)

        `when`(qsHost.uiEventLogger).thenReturn(uiEventLogger)



        tile = UiModeNightTile(

        tile =

            UiModeNightTile(

                qsHost,

                testableLooper.looper,

                Handler(testableLooper.looper),
@@ -104,7 +94,8 @@ class UiModeNightTileTest : SysuiTestCase() { 
                qsLogger,

                configurationController,

                batteryController,

                locationController)

                locationController

            )

    }



    @Test