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

Commit 82dfcef4 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Notifs] Rename BaseHeadsUpManager to HeadsUpManagerImpl. 

Now that there's only one implementation of HeadsUpManager, we should
name its implementation HeadsUpManagerImpl.

Bug: 378142453
Flag: EXEMPT refactor
Test: compiles
Test: atest HeadsUpManagerPhoneTest HeadsUpManagerImplTest
Change-Id: I5166eb73816118a1e6d9124afacd8b5f29f88bc2
parent c039238b

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/HeadsUpCoordinatorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.No 
import com.android.systemui.statusbar.notification.collection.notifcollection.NotifLifetimeExtender.OnEndLifetimeExtensionCallback

import com.android.systemui.statusbar.notification.collection.provider.LaunchFullScreenIntentProvider

import com.android.systemui.statusbar.notification.collection.render.NodeController

import com.android.systemui.statusbar.notification.headsup.BaseHeadsUpManager

import com.android.systemui.statusbar.notification.headsup.HeadsUpManagerImpl

import com.android.systemui.statusbar.notification.headsup.OnHeadsUpChangedListener

import com.android.systemui.statusbar.notification.interruption.HeadsUpViewBinder

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision
@@ -100,7 +100,7 @@ class HeadsUpCoordinatorTest : SysuiTestCase() { 


    private val notifPipeline: NotifPipeline = mock()

    private val logger = HeadsUpCoordinatorLogger(logcatLogBuffer(), verbose = true)

    private val headsUpManager: BaseHeadsUpManager = mock()

    private val headsUpManager: HeadsUpManagerImpl = mock()

    private val headsUpViewBinder: HeadsUpViewBinder = mock()

    private val visualInterruptionDecisionProvider: VisualInterruptionDecisionProvider = mock()

    private val remoteInputManager: NotificationRemoteInputManager = mock()

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/AvalancheControllerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class AvalancheControllerTest : SysuiTestCase() { 
    private val mGlobalSettings = FakeGlobalSettings()

    private val mSystemClock = FakeSystemClock()

    private val mExecutor = FakeExecutor(mSystemClock)

    private lateinit var testableHeadsUpManager: BaseHeadsUpManager

    private lateinit var testableHeadsUpManager: HeadsUpManagerImpl



    @Before

    fun setUp() {
@@ -116,7 +116,7 @@ class AvalancheControllerTest : SysuiTestCase() { 
            )

    }



    private fun createHeadsUpEntry(id: Int): BaseHeadsUpManager.HeadsUpEntry {

    private fun createHeadsUpEntry(id: Int): HeadsUpManagerImpl.HeadsUpEntry {

        return testableHeadsUpManager.createHeadsUpEntry(

            NotificationEntryBuilder()

                .setSbn(HeadsUpManagerTestUtil.createSbn(id, Notification.Builder(mContext, "")))
@@ -124,7 +124,7 @@ class AvalancheControllerTest : SysuiTestCase() { 
        )

    }



    private fun createFsiHeadsUpEntry(id: Int): BaseHeadsUpManager.HeadsUpEntry {

    private fun createFsiHeadsUpEntry(id: Int): HeadsUpManagerImpl.HeadsUpEntry {

        return testableHeadsUpManager.createHeadsUpEntry(createFullScreenIntentEntry(id, mContext))

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/BaseHeadsUpManagerTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.java

+53 −53

File changed and moved.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerPhoneTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ import platform.test.runner.parameterized.Parameters 
@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

@RunWithLooper

class HeadsUpManagerPhoneTest(flags: FlagsParameterization) : BaseHeadsUpManagerTest(flags) {

class HeadsUpManagerPhoneTest(flags: FlagsParameterization) : HeadsUpManagerImplTest(flags) {



    private val mHeadsUpManagerLogger = HeadsUpManagerLogger(logcatLogBuffer())
@@ -88,8 +88,8 @@ class HeadsUpManagerPhoneTest(flags: FlagsParameterization) : BaseHeadsUpManager 


    @Mock private lateinit var mBgHandler: Handler



    private fun createHeadsUpManagerPhone(): BaseHeadsUpManager {

        return BaseHeadsUpManager(

    private fun createHeadsUpManagerPhone(): HeadsUpManagerImpl {

        return HeadsUpManagerImpl(

            mContext,

            mHeadsUpManagerLogger,

            statusBarStateController,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/TestableHeadsUpManager.java

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.android.systemui.util.kotlin.JavaAdapter; 
import com.android.systemui.util.settings.GlobalSettings;

import com.android.systemui.util.time.SystemClock;



class TestableHeadsUpManager extends BaseHeadsUpManager {

class TestableHeadsUpManager extends HeadsUpManagerImpl {



    private HeadsUpEntry mLastCreatedEntry;
@@ -78,10 +78,10 @@ class TestableHeadsUpManager extends BaseHeadsUpManager { 
                shadeInteractor,

                avalancheController);



        mTouchAcceptanceDelay = BaseHeadsUpManagerTest.TEST_TOUCH_ACCEPTANCE_TIME;

        mMinimumDisplayTime = BaseHeadsUpManagerTest.TEST_MINIMUM_DISPLAY_TIME;

        mAutoDismissTime = BaseHeadsUpManagerTest.TEST_AUTO_DISMISS_TIME;

        mStickyForSomeTimeAutoDismissTime = BaseHeadsUpManagerTest.TEST_STICKY_AUTO_DISMISS_TIME;

        mTouchAcceptanceDelay = HeadsUpManagerImplTest.TEST_TOUCH_ACCEPTANCE_TIME;

        mMinimumDisplayTime = HeadsUpManagerImplTest.TEST_MINIMUM_DISPLAY_TIME;

        mAutoDismissTime = HeadsUpManagerImplTest.TEST_AUTO_DISMISS_TIME;

        mStickyForSomeTimeAutoDismissTime = HeadsUpManagerImplTest.TEST_STICKY_AUTO_DISMISS_TIME;

    }



    @NonNull