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

Commit 2bd35a6e authored by Marcello Galhardo's avatar Marcello Galhardo Committed by Automerger Merge Worker
Browse files

Merge "Add Kotlin-friendly SingleActivityFactory class" into udc-qpr-dev am: d785a3cd 

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



Change-Id: I5ca4eace1324e885c118d4068cfe7dfc23726599
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2eb9b86 d785a3cd

packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsEditingActivityTest.kt

+13 −18
Original line number Original line Diff line number Diff line
@@ -11,9 +11,9 @@ import android.window.OnBackInvokedCallback 
import android.window.OnBackInvokedDispatcher

import android.window.OnBackInvokedDispatcher

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import androidx.test.rule.ActivityTestRule

import androidx.test.rule.ActivityTestRule

import androidx.test.runner.intercepting.SingleActivityFactory

import com.android.systemui.R

import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import com.android.systemui.activity.SingleActivityFactory

import com.android.systemui.controls.CustomIconCache

import com.android.systemui.controls.CustomIconCache

import com.android.systemui.controls.controller.ControlsControllerImpl

import com.android.systemui.controls.controller.ControlsControllerImpl

import com.android.systemui.flags.FakeFeatureFlags

import com.android.systemui.flags.FakeFeatureFlags
@@ -63,12 +63,8 @@ class ControlsEditingActivityTest : SysuiTestCase() { 
    @JvmField

    @JvmField

    var activityRule =

    var activityRule =

        ActivityTestRule(

        ActivityTestRule(

            object :

            /* activityFactory= */ SingleActivityFactory {

                SingleActivityFactory<TestableControlsEditingActivity>(

                TestableControlsEditingActivity(

                    TestableControlsEditingActivity::class.java

                ) {

                override fun create(intent: Intent?): TestableControlsEditingActivity {

                    return TestableControlsEditingActivity(

                    featureFlags,

                    featureFlags,

                    uiExecutor,

                    uiExecutor,

                    controller,

                    controller,
@@ -77,10 +73,9 @@ class ControlsEditingActivityTest : SysuiTestCase() { 
                    mockDispatcher,

                    mockDispatcher,

                    latch

                    latch

                )

                )

                }

            },

            },

            false,

            /* initialTouchMode= */ false,

            false

            /* launchActivity= */ false,

        )

        )





    @Before

    @Before

packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsFavoritingActivityTest.kt

+13 −18
Original line number Original line Diff line number Diff line
@@ -13,9 +13,9 @@ import android.window.OnBackInvokedDispatcher 
import androidx.test.filters.FlakyTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import androidx.test.rule.ActivityTestRule

import androidx.test.rule.ActivityTestRule

import androidx.test.runner.intercepting.SingleActivityFactory

import com.android.systemui.R

import com.android.systemui.R

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import com.android.systemui.activity.SingleActivityFactory

import com.android.systemui.controls.ControlStatus

import com.android.systemui.controls.ControlStatus

import com.android.systemui.controls.ControlsServiceInfo

import com.android.systemui.controls.ControlsServiceInfo

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.controls.controller.ControlsController
@@ -91,12 +91,8 @@ class ControlsFavoritingActivityTest : SysuiTestCase() { 
    @JvmField

    @JvmField

    var activityRule =

    var activityRule =

        ActivityTestRule(

        ActivityTestRule(

            object :

            /* activityFactory= */ SingleActivityFactory {

                SingleActivityFactory<TestableControlsFavoritingActivity>(

                TestableControlsFavoritingActivity(

                    TestableControlsFavoritingActivity::class.java

                ) {

                override fun create(intent: Intent?): TestableControlsFavoritingActivity {

                    return TestableControlsFavoritingActivity(

                    featureFlags,

                    featureFlags,

                    executor,

                    executor,

                    controller,

                    controller,
@@ -105,10 +101,9 @@ class ControlsFavoritingActivityTest : SysuiTestCase() { 
                    mockDispatcher,

                    mockDispatcher,

                    latch

                    latch

                )

                )

                }

            },

            },

            false,

            /* initialTouchMode= */ false,

            false

            /* launchActivity= */ false,

        )

        )





    @Before

    @Before

packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsProviderSelectorActivityTest.kt

+15 −20
Original line number Original line Diff line number Diff line
@@ -29,8 +29,8 @@ import android.window.OnBackInvokedCallback 
import android.window.OnBackInvokedDispatcher

import android.window.OnBackInvokedDispatcher

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import androidx.test.rule.ActivityTestRule

import androidx.test.rule.ActivityTestRule

import androidx.test.runner.intercepting.SingleActivityFactory

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import com.android.systemui.activity.SingleActivityFactory

import com.android.systemui.controls.ControlsServiceInfo

import com.android.systemui.controls.ControlsServiceInfo

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.controls.panels.AuthorizedPanelsRepository

import com.android.systemui.controls.panels.AuthorizedPanelsRepository
@@ -91,12 +91,8 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() { 
    @JvmField

    @JvmField

    var activityRule =

    var activityRule =

        ActivityTestRule(

        ActivityTestRule(

            object :

            /* activityFactory= */ SingleActivityFactory {

                SingleActivityFactory<TestableControlsProviderSelectorActivity>(

                TestableControlsProviderSelectorActivity(

                    TestableControlsProviderSelectorActivity::class.java

                ) {

                override fun create(intent: Intent?): TestableControlsProviderSelectorActivity {

                    return TestableControlsProviderSelectorActivity(

                    executor,

                    executor,

                    backExecutor,

                    backExecutor,

                    listingController,

                    listingController,
@@ -107,10 +103,9 @@ class ControlsProviderSelectorActivityTest : SysuiTestCase() { 
                    mockDispatcher,

                    mockDispatcher,

                    latch

                    latch

                )

                )

                }

            },

            },

            false,

            /* initialTouchMode= */ false,

            false

            /* launchActivity= */ false,

        )

        )





    @Before

    @Before

packages/SystemUI/tests/src/com/android/systemui/controls/management/ControlsRequestDialogTest.kt

+13 −14
Original line number Original line Diff line number Diff line
@@ -30,8 +30,8 @@ import android.testing.TestableLooper 
import androidx.lifecycle.Lifecycle

import androidx.lifecycle.Lifecycle

import androidx.test.filters.MediumTest

import androidx.test.filters.MediumTest

import androidx.test.rule.ActivityTestRule

import androidx.test.rule.ActivityTestRule

import androidx.test.runner.intercepting.SingleActivityFactory

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import com.android.systemui.activity.SingleActivityFactory

import com.android.systemui.controls.controller.ControlInfo

import com.android.systemui.controls.controller.ControlInfo

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.controls.controller.ControlsController

import com.android.systemui.settings.UserTracker

import com.android.systemui.settings.UserTracker
@@ -81,19 +81,18 @@ class ControlsRequestDialogTest : SysuiTestCase() { 




    @Rule

    @Rule

    @JvmField

    @JvmField

    var activityRule = ActivityTestRule<TestControlsRequestDialog>(

    var activityRule = ActivityTestRule(

            object : SingleActivityFactory<TestControlsRequestDialog>(

        /* activityFactory= */ SingleActivityFactory {

                    TestControlsRequestDialog::class.java

            TestControlsRequestDialog(

            ) {

                    override fun create(intent: Intent?): TestControlsRequestDialog {

                        return TestControlsRequestDialog(

                    mainExecutor,

                    mainExecutor,

                    controller,

                    controller,

                    userTracker,

                    userTracker,

                    listingController

                    listingController

            )

            )

                    }

        },

            }, false, false)

        /* initialTouchMode= */ false,

        /* launchActivity= */ false,

    )





    private lateinit var control: Control

    private lateinit var control: Control

packages/SystemUI/tests/src/com/android/systemui/controls/ui/ControlsActivityTest.kt

+12 −17
Original line number Original line Diff line number Diff line
@@ -23,8 +23,8 @@ import android.testing.AndroidTestingRunner 
import android.testing.TestableLooper

import android.testing.TestableLooper

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import androidx.test.rule.ActivityTestRule

import androidx.test.rule.ActivityTestRule

import androidx.test.runner.intercepting.SingleActivityFactory

import com.android.systemui.SysuiTestCase

import com.android.systemui.SysuiTestCase

import com.android.systemui.activity.SingleActivityFactory

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.broadcast.BroadcastDispatcher

import com.android.systemui.controls.settings.ControlsSettingsDialogManager

import com.android.systemui.controls.settings.ControlsSettingsDialogManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.FeatureFlags
@@ -53,12 +53,8 @@ class ControlsActivityTest : SysuiTestCase() { 
    @JvmField

    @JvmField

    var activityRule =

    var activityRule =

        ActivityTestRule(

        ActivityTestRule(

            object :

            /* activityFactory= */ SingleActivityFactory {

                SingleActivityFactory<TestableControlsActivity>(

                TestableControlsActivity(

                    TestableControlsActivity::class.java

                ) {

                override fun create(intent: Intent?): TestableControlsActivity {

                    return TestableControlsActivity(

                    uiController,

                    uiController,

                    broadcastDispatcher,

                    broadcastDispatcher,

                    dreamManager,

                    dreamManager,
@@ -66,10 +62,9 @@ class ControlsActivityTest : SysuiTestCase() { 
                    controlsSettingsDialogManager,

                    controlsSettingsDialogManager,

                    keyguardStateController,

                    keyguardStateController,

                )

                )

                }

            },

            },

            false,

            /* initialTouchMode= */ false,

            false

            /* launchActivity= */ false,

        )

        )





    @Before

    @Before