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

Commit f84dfe23 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8b9623c0,I0828f66a,Ib2d45661 into main

* changes:
  [Notif] Update HeadsUpManagerImplTest to use `underTest` everywhere.
  [Notif] Update HeadsUpManagerImplTest to use Kosmos more heavily.
  [Notif] Remove TestableHeadsUpManager, use implementation directly.
parents 6679ab36 d75970a6
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper
import com.android.systemui.statusbar.policy.configurationController
import com.android.systemui.testKosmos
import com.android.systemui.util.concurrency.FakeExecutor
import com.android.systemui.util.concurrency.mockExecutorHandler
import com.android.systemui.util.kotlin.JavaAdapter
import com.android.systemui.util.settings.FakeGlobalSettings
import com.android.systemui.util.time.FakeSystemClock
@@ -97,7 +98,7 @@ class AvalancheControllerTest : SysuiTestCase() {
            AvalancheController(dumpManager, mUiEventLoggerFake, mHeadsUpManagerLogger, mBgHandler)

        testableHeadsUpManager =
            TestableHeadsUpManager(
            HeadsUpManagerImpl(
                mContext,
                mLogger,
                kosmos.statusBarStateController,
@@ -105,9 +106,10 @@ class AvalancheControllerTest : SysuiTestCase() {
                GroupMembershipManagerImpl(),
                kosmos.visualStabilityProvider,
                kosmos.configurationController,
                mExecutor,
                mockExecutorHandler(mExecutor),
                mGlobalSettings,
                mSystemClock,
                mExecutor,
                mAccessibilityMgr,
                mUiEventLoggerFake,
                JavaAdapter(kosmos.testScope),
+23 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun
import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper
import com.android.systemui.util.concurrency.FakeExecutor
import com.android.systemui.util.concurrency.mockExecutorHandler
import com.android.systemui.util.kotlin.JavaAdapter
import com.android.systemui.util.settings.FakeGlobalSettings
import com.android.systemui.util.time.FakeSystemClock
@@ -87,7 +88,7 @@ open class HeadsUpManagerImplOldTest(flags: FlagsParameterization?) : SysuiTestC
    @Mock protected var mRow: ExpandableNotificationRow? = null

    private fun createHeadsUpManager(): HeadsUpManagerImpl {
        return TestableHeadsUpManager(
        return HeadsUpManagerImpl(
            mContext,
            mLogger,
            mKosmos.statusBarStateController,
@@ -95,9 +96,10 @@ open class HeadsUpManagerImplOldTest(flags: FlagsParameterization?) : SysuiTestC
            GroupMembershipManagerImpl(),
            mKosmos.visualStabilityProvider,
            mKosmos.configurationController,
            mExecutor,
            mockExecutorHandler(mExecutor),
            mGlobalSettings,
            mSystemClock,
            mExecutor,
            mAccessibilityMgr,
            mUiEventLoggerFake,
            JavaAdapter(mKosmos.testScope),
@@ -150,6 +152,24 @@ open class HeadsUpManagerImplOldTest(flags: FlagsParameterization?) : SysuiTestC
    @Throws(Exception::class)
    override fun SysuiSetup() {
        super.SysuiSetup()
        mContext.getOrCreateTestableResources().apply {
            this.addOverride(R.integer.ambient_notification_extension_time, TEST_EXTENSION_TIME)
            this.addOverride(R.integer.touch_acceptance_delay, TEST_TOUCH_ACCEPTANCE_TIME)
            this.addOverride(
                R.integer.heads_up_notification_minimum_time,
                TEST_MINIMUM_DISPLAY_TIME,
            )
            this.addOverride(
                R.integer.heads_up_notification_minimum_time_with_throttling,
                TEST_MINIMUM_DISPLAY_TIME,
            )
            this.addOverride(R.integer.heads_up_notification_decay, TEST_AUTO_DISMISS_TIME)
            this.addOverride(
                R.integer.sticky_heads_up_notification_time,
                TEST_STICKY_AUTO_DISMISS_TIME,
            )
        }

        mAvalancheController =
            AvalancheController(dumpManager!!, mUiEventLoggerFake, mLogger, mBgHandler!!)
        Mockito.`when`(mShadeInteractor!!.isAnyExpanded).thenReturn(MutableStateFlow(true))
@@ -662,6 +682,7 @@ open class HeadsUpManagerImplOldTest(flags: FlagsParameterization?) : SysuiTestC
    companion object {
        const val TEST_TOUCH_ACCEPTANCE_TIME: Int = 200
        const val TEST_A11Y_AUTO_DISMISS_TIME: Int = 1000
        const val TEST_EXTENSION_TIME = 500

        const val TEST_MINIMUM_DISPLAY_TIME: Int = 400
        const val TEST_AUTO_DISMISS_TIME: Int = 600
+125 −151

File changed.

Preview size limit exceeded, changes collapsed.

+0 −162

File deleted.

Preview size limit exceeded, changes collapsed.

+3 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@
    <!-- Minimum display time for a heads up notification, in milliseconds. -->
    <integer name="heads_up_notification_minimum_time">2000</integer>

    <!-- Minimum display time for a heads up notification if throttling is enabled, in milliseconds. -->
    <integer name="heads_up_notification_minimum_time_with_throttling">500</integer>

    <!-- Display time for a sticky heads up notification, in milliseconds. -->
    <integer name="sticky_heads_up_notification_time">60000</integer>

Loading