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

Commit 209ff099 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Call] Update call chip click to show notification instead of app. 

Promoted notification chips will show the notification when tapped.
Since the call chip is also derived from a notification, it should also
show the notification once we've enabled promoted notification chips.

Bug: 414830065
Bug: 364653005
Flag: android.app.ui_rich_ongoing
Test: With ui_rich_ongoing off, trigger call chip & tap it -> verify
activity is launched
Test: With ui_rich_ongoing on, trigger call chip & tap it -> verify
notification is shown
Test: atest CallChipViewModelTest

Change-Id: Ib75f389201554502a5c03f43b2adff45a0a5d5a2
parent 3d1a09c2

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModelTest.kt

+266 −7
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.plugins.activityStarter 
import com.android.systemui.res.R

import com.android.systemui.res.R

import com.android.systemui.statusbar.StatusBarIconView

import com.android.systemui.statusbar.StatusBarIconView

import com.android.systemui.statusbar.chips.StatusBarChipsReturnAnimations

import com.android.systemui.statusbar.chips.StatusBarChipsReturnAnimations

import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer
@@ -606,7 +607,9 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 




    @Test

    @Test

    @DisableChipsModernization

    @DisableChipsModernization

    fun chip_inCall_nullIntent_nullClickListener() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    @EnableFlags(FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_nullIntent_chipsModFlagOff_promotedUiFlagOff_nullClickListener() =

        kosmos.runTest {

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -617,7 +620,9 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 




    @Test

    @Test

    @DisableChipsModernization

    @DisableChipsModernization

    fun chip_inCall_positiveStartTime_validIntent_clickListenerLaunchesIntent() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    @EnableFlags(FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_positiveStartTime_validIntent_chipsModFlagOff_promotedUiFlagOff_clickListenerLaunchesIntent() =

        kosmos.runTest {

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -635,7 +640,9 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 




    @Test

    @Test

    @DisableChipsModernization

    @DisableChipsModernization

    fun chip_inCall_zeroStartTime_validIntent_clickListenerLaunchesIntent() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    @EnableFlags(FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_zeroStartTime_validIntent_chipsModFlagOff_promotedUiFlagOff_clickListenerLaunchesIntent() =

        kosmos.runTest {

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -652,9 +659,79 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
            verify(kosmos.activityStarter).postStartActivityDismissingKeyguard(pendingIntent, null)

            verify(kosmos.activityStarter).postStartActivityDismissingKeyguard(pendingIntent, null)

        }

        }





    @Test

    @DisableChipsModernization

    @EnableFlags(PromotedNotificationUi.FLAG_NAME, FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_nullIntent_chipsModFlagOff_promotedUiFlagOn_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latestChipTapKey by

                collectLastValue(

                    statusBarNotificationChipsInteractor.promotedNotificationChipTapEvent

                )



            addOngoingCallState(key = "fakeCallKey", contentIntent = null)



            val clickListener = (latest as OngoingActivityChipModel.Active).onClickListenerLegacy

            assertThat(clickListener).isNotNull()



            clickListener!!.onClick(chipView)



            assertThat(latestChipTapKey).isEqualTo("fakeCallKey")

        }



    @Test

    @DisableChipsModernization

    @EnableFlags(PromotedNotificationUi.FLAG_NAME, FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_positiveStartTime_validIntent_chipsModFlagOff_promotedUiFlagOn_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latestChipTapKey by

                collectLastValue(

                    statusBarNotificationChipsInteractor.promotedNotificationChipTapEvent

                )



            val pendingIntent = mock<PendingIntent>()

            addOngoingCallState(

                key = "fakeCallKey",

                startTimeMs = 1000,

                contentIntent = pendingIntent,

            )

            val clickListener = (latest as OngoingActivityChipModel.Active).onClickListenerLegacy

            assertThat(clickListener).isNotNull()



            clickListener!!.onClick(chipView)



            assertThat(latestChipTapKey).isEqualTo("fakeCallKey")

        }



    @Test

    @DisableChipsModernization

    @EnableFlags(PromotedNotificationUi.FLAG_NAME, FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_zeroStartTime_validIntent_chipsModFlagOff_promotedUiFlagOn_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latestChipTapKey by

                collectLastValue(

                    statusBarNotificationChipsInteractor.promotedNotificationChipTapEvent

                )



            val pendingIntent = mock<PendingIntent>()

            addOngoingCallState(key = "fakeCallKey", startTimeMs = 0, contentIntent = pendingIntent)

            val clickListener = (latest as OngoingActivityChipModel.Active).onClickListenerLegacy



            assertThat(clickListener).isNotNull()



            clickListener!!.onClick(chipView)



            assertThat(latestChipTapKey).isEqualTo("fakeCallKey")

        }



    @Test

    @Test

    @EnableChipsModernization

    @EnableChipsModernization

    fun chip_inCall_nullIntent_noneClickBehavior() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    @EnableFlags(FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_nullIntent_chipsModFlagOn_promotedUiFlagOff_noneClickBehavior() =

        kosmos.runTest {

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -666,7 +743,9 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 




    @Test

    @Test

    @EnableChipsModernization

    @EnableChipsModernization

    fun chip_inCall_positiveStartTime_validIntent_clickBehaviorLaunchesIntent() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    @EnableFlags(FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_positiveStartTime_validIntent_chipsModFlagOn_promotedUiFlagOff_clickBehaviorLaunchesIntent() =

        kosmos.runTest {

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -687,7 +766,9 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 




    @Test

    @Test

    @EnableChipsModernization

    @EnableChipsModernization

    fun chip_inCall_zeroStartTime_validIntent_clickBehaviorLaunchesIntent() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    @EnableFlags(FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_zeroStartTime_validIntent_chipsModFlagOn_promotedUiFlagOff_clickBehaviorLaunchesIntent() =

        kosmos.runTest {

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latest by collectLastValue(underTest.chip)
@@ -706,10 +787,90 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
            verify(kosmos.activityStarter).postStartActivityDismissingKeyguard(pendingIntent, null)

            verify(kosmos.activityStarter).postStartActivityDismissingKeyguard(pendingIntent, null)

        }

        }





    @Test

    @EnableChipsModernization

    @EnableFlags(PromotedNotificationUi.FLAG_NAME, FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_nullIntent_chipsModFlagOn_promotedUiFlagOn_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latestChipTapKey by

                collectLastValue(

                    statusBarNotificationChipsInteractor.promotedNotificationChipTapEvent

                )



            addOngoingCallState(key = "fakeCallKey", startTimeMs = 1000, contentIntent = null)



            val clickBehavior = (latest as OngoingActivityChipModel.Active).clickBehavior

            assertThat(clickBehavior)

                .isInstanceOf(

                    OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification::class.java

                )



            (clickBehavior as OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification)

                .onClick()



            assertThat(latestChipTapKey).isEqualTo("fakeCallKey")

        }



    @Test

    @EnableChipsModernization

    @EnableFlags(PromotedNotificationUi.FLAG_NAME, FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_positiveStartTime_validIntent_chipsModFlagOn_promotedUiFlagOn_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latestChipTapKey by

                collectLastValue(

                    statusBarNotificationChipsInteractor.promotedNotificationChipTapEvent

                )



            val pendingIntent = mock<PendingIntent>()

            addOngoingCallState(

                key = "fakeCallKey",

                startTimeMs = 1000,

                contentIntent = pendingIntent,

            )



            val clickBehavior = (latest as OngoingActivityChipModel.Active).clickBehavior

            assertThat(clickBehavior)

                .isInstanceOf(

                    OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification::class.java

                )

            (clickBehavior as OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification)

                .onClick()



            assertThat(latestChipTapKey).isEqualTo("fakeCallKey")

        }



    @Test

    @EnableChipsModernization

    @EnableFlags(PromotedNotificationUi.FLAG_NAME, FLAG_OPT_IN_RICH_ONGOING)

    fun chip_inCall_zeroStartTime_validIntent_chipsModFlagOn_promotedUiFlagOn_clickingChipNotifiesInteractor() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.chip)

            val latestChipTapKey by

                collectLastValue(

                    statusBarNotificationChipsInteractor.promotedNotificationChipTapEvent

                )



            val pendingIntent = mock<PendingIntent>()

            addOngoingCallState(key = "fakeCallKey", startTimeMs = 0, contentIntent = pendingIntent)



            val clickBehavior = (latest as OngoingActivityChipModel.Active).clickBehavior

            assertThat(clickBehavior)

                .isInstanceOf(

                    OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification::class.java

                )

            (clickBehavior as OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification)

                .onClick()



            assertThat(latestChipTapKey).isEqualTo("fakeCallKey")

        }



    @Test

    @Test

    @EnableFlags(StatusBarChipsReturnAnimations.FLAG_NAME)

    @EnableFlags(StatusBarChipsReturnAnimations.FLAG_NAME)

    @EnableChipsModernization

    @EnableChipsModernization

    fun chipWithReturnAnimation_updatesCorrectly_withStateAndTransitionState() =

    @DisableFlags(PromotedNotificationUi.FLAG_NAME)

    fun chipWithReturnAnimation_promotedUiFlagOff_updatesCorrectly_withStateAndTransitionState() =

        kosmos.runTest {

        kosmos.runTest {

            val pendingIntent = mock<PendingIntent>()

            val pendingIntent = mock<PendingIntent>()

            val intent = mock<Intent>()

            val intent = mock<Intent>()
@@ -789,6 +950,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
                (latest as OngoingActivityChipModel.Active).clickBehavior

                (latest as OngoingActivityChipModel.Active).clickBehavior

                    as OngoingActivityChipModel.ClickBehavior.ExpandAction

                    as OngoingActivityChipModel.ClickBehavior.ExpandAction

            clickBehavior.onClick(expandable)

            clickBehavior.onClick(expandable)



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat(latest!!.transitionManager!!.controllerFactory).isEqualTo(factory)

            assertThat(latest!!.transitionManager!!.controllerFactory).isEqualTo(factory)
@@ -844,6 +1006,103 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 
            assertThat(latest!!.transitionManager!!.controllerFactory).isNull()

            assertThat(latest!!.transitionManager!!.controllerFactory).isNull()

        }

        }





    // When PromotedNotificationUi flag is on, then we don't have any custom launch animation, we

    // only have the return animation.

    @Test

    @EnableFlags(StatusBarChipsReturnAnimations.FLAG_NAME, PromotedNotificationUi.FLAG_NAME)

    @EnableChipsModernization

    fun chipWithReturnAnimation_promotedUiFlagOn_updatesCorrectly_withStateAndTransitionState() =

        kosmos.runTest {

            val pendingIntent = mock<PendingIntent>()

            val intent = mock<Intent>()

            whenever(pendingIntent.intent).thenReturn(intent)

            val component = mock<ComponentName>()

            whenever(intent.component).thenReturn(component)



            val expandable = mock<Expandable>()

            val activityController = mock<ActivityTransitionAnimator.Controller>()

            whenever(

                    expandable.activityTransitionController(

                        anyOrNull(),

                        anyOrNull(),

                        any(),

                        anyOrNull(),

                        any(),

                    )

                )

                .thenReturn(activityController)



            val latest by collectLastValue(underTest.chip)



            // Start off with no call.

            removeOngoingCallState(key = NOTIFICATION_KEY)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

            assertThat(latest!!.transitionManager!!.controllerFactory).isNull()



            // Call starts [NoCall -> InCall(isAppVisible=true), NoTransition].

            addOngoingCallState(

                key = NOTIFICATION_KEY,

                startTimeMs = 345,

                contentIntent = pendingIntent,

                uid = NOTIFICATION_UID,

                isAppVisible = true,

            )

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isTrue()

            assertThat(latest!!.transitionManager!!.hideChipForTransition).isFalse()

            val factory = latest!!.transitionManager!!.controllerFactory

            assertThat(factory!!.component).isEqualTo(component)



            // Request a return transition [InCall(isAppVisible=true), NoTransition ->

            // ReturnRequested].

            factory.onCompose(expandable)

            var controller = factory.createController(forLaunch = false)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat(latest!!.transitionManager!!.controllerFactory).isEqualTo(factory)

            assertThat(latest!!.transitionManager!!.hideChipForTransition).isTrue()



            // Start the return transition [InCall(isAppVisible=true), ReturnRequested ->

            // Returning].

            controller.onTransitionAnimationStart(isExpandingFullyAbove = false)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat(latest!!.transitionManager!!.controllerFactory).isEqualTo(factory)

            assertThat(latest!!.transitionManager!!.hideChipForTransition).isFalse()



            // End the return transition [InCall(isAppVisible=true), Returning -> NoTransition].

            controller.onTransitionAnimationEnd(isExpandingFullyAbove = false)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat(latest!!.transitionManager!!.controllerFactory).isEqualTo(factory)

            assertThat(latest!!.transitionManager!!.hideChipForTransition).isFalse()



            // Settle the return transition [InCall(isAppVisible=true) ->

            // InCall(isAppVisible=false), NoTransition].

            kosmos.activityManagerRepository.fake.setIsAppVisible(NOTIFICATION_UID, false)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat(latest!!.transitionManager!!.controllerFactory).isEqualTo(factory)

            assertThat(latest!!.transitionManager!!.hideChipForTransition).isFalse()



            // End the call.

            removeOngoingCallState(key = NOTIFICATION_KEY)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

            assertThat(latest!!.transitionManager!!.controllerFactory).isNull()



            // End the call with the app hidden [InCall(isAppVisible=false) -> NoCall,

            // NoTransition].

            addOngoingCallState(

                key = NOTIFICATION_KEY,

                startTimeMs = 345,

                contentIntent = pendingIntent,

                isAppVisible = false,

            )

            removeOngoingCallState(key = NOTIFICATION_KEY)

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

            assertThat(latest!!.transitionManager!!.controllerFactory).isNull()

        }



    @Test

    @Test

    @EnableFlags(StatusBarChipsReturnAnimations.FLAG_NAME)

    @EnableFlags(StatusBarChipsReturnAnimations.FLAG_NAME)

    @EnableChipsModernization

    @EnableChipsModernization

packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt

+35 −10
Original line number Original line Diff line number Diff line
@@ -38,12 +38,14 @@ import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad 
import com.android.systemui.statusbar.chips.StatusBarChipsLog

import com.android.systemui.statusbar.chips.StatusBarChipsLog

import com.android.systemui.statusbar.chips.StatusBarChipsReturnAnimations

import com.android.systemui.statusbar.chips.StatusBarChipsReturnAnimations

import com.android.systemui.statusbar.chips.call.domain.interactor.CallChipInteractor

import com.android.systemui.statusbar.chips.call.domain.interactor.CallChipInteractor

import com.android.systemui.statusbar.chips.notification.domain.interactor.StatusBarNotificationChipsInteractor

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.ColorsModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.view.ChipBackgroundContainer

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.ui.viewmodel.OngoingActivityChipViewModel

import com.android.systemui.statusbar.chips.uievents.StatusBarChipsUiEventLogger

import com.android.systemui.statusbar.chips.uievents.StatusBarChipsUiEventLogger

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel

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

import com.android.systemui.util.time.SystemClock
@@ -58,6 +60,7 @@ import kotlinx.coroutines.flow.first 
import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.mapNotNull

import kotlinx.coroutines.flow.mapNotNull

import kotlinx.coroutines.flow.stateIn

import kotlinx.coroutines.flow.stateIn

import kotlinx.coroutines.launch





/** View model for the ongoing phone call chip shown in the status bar. */

/** View model for the ongoing phone call chip shown in the status bar. */

@SysUISingleton

@SysUISingleton
@@ -67,6 +70,7 @@ constructor( 
    @Main private val context: Context,

    @Main private val context: Context,

    @Application private val scope: CoroutineScope,

    @Application private val scope: CoroutineScope,

    interactor: CallChipInteractor,

    interactor: CallChipInteractor,

    private val notifChipsInteractor: StatusBarNotificationChipsInteractor,

    systemClock: SystemClock,

    systemClock: SystemClock,

    private val activityStarter: ActivityStarter,

    private val activityStarter: ActivityStarter,

    @StatusBarChipsLog private val logBuffer: LogBuffer,

    @StatusBarChipsLog private val logBuffer: LogBuffer,
@@ -227,8 +231,8 @@ constructor( 
            icon = icon,

            icon = icon,

            content = content,

            content = content,

            colors = colors,

            colors = colors,

            onClickListenerLegacy = getOnClickListener(intent, instanceId),

            onClickListenerLegacy = getOnClickListener(intent, instanceId, state.notificationKey),

            clickBehavior = getClickBehavior(intent, instanceId),

            clickBehavior = getClickBehavior(intent, instanceId, state.notificationKey),

            isHidden = isHidden,

            isHidden = isHidden,

            transitionManager = getTransitionManager(state, transitionState),

            transitionManager = getTransitionManager(state, transitionState),

            instanceId = instanceId,

            instanceId = instanceId,
@@ -238,18 +242,23 @@ constructor( 
    private fun getOnClickListener(

    private fun getOnClickListener(

        intent: PendingIntent?,

        intent: PendingIntent?,

        instanceId: InstanceId?,

        instanceId: InstanceId?,

        notificationKey: String,

    ): View.OnClickListener? {

    ): View.OnClickListener? {

        if (PromotedNotificationUi.isEnabled) {

            return View.OnClickListener { view ->

                StatusBarChipsModernization.assertInLegacyMode()

                logChipTapped(instanceId)

                onCallChipTappedWithPromotionEnabled(notificationKey)

            }

        }

        if (intent == null) {

        if (intent == null) {

            return null

            return null

        }

        }

        return View.OnClickListener { view ->

        return View.OnClickListener { view ->

            StatusBarChipsModernization.assertInLegacyMode()

            StatusBarChipsModernization.assertInLegacyMode()





            logger.i({ "Chip clicked" }) {}

            logChipTapped(instanceId)

            uiEventLogger.logChipTapToShow(instanceId)





            // TODO(b/414830065): Tapping the call chip should show the notification instead of

            // launching the activity.

            val backgroundView =

            val backgroundView =

                view.requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)

                view.requireViewById<ChipBackgroundContainer>(R.id.ongoing_activity_chip_background)

            // This mimics OngoingCallController#updateChipClickListener.

            // This mimics OngoingCallController#updateChipClickListener.
@@ -266,7 +275,15 @@ constructor( 
    private fun getClickBehavior(

    private fun getClickBehavior(

        intent: PendingIntent?,

        intent: PendingIntent?,

        instanceId: InstanceId?,

        instanceId: InstanceId?,

        notificationKey: String,

    ): OngoingActivityChipModel.ClickBehavior {

    ): OngoingActivityChipModel.ClickBehavior {

        if (PromotedNotificationUi.isEnabled) {

            return OngoingActivityChipModel.ClickBehavior.ShowHeadsUpNotification {

                StatusBarChipsModernization.unsafeAssertInNewMode()

                logChipTapped(instanceId)

                onCallChipTappedWithPromotionEnabled(notificationKey)

            }

        }

        if (intent == null) {

        if (intent == null) {

            return OngoingActivityChipModel.ClickBehavior.None

            return OngoingActivityChipModel.ClickBehavior.None

        }

        }
@@ -274,11 +291,8 @@ constructor( 
            onClick = { expandable ->

            onClick = { expandable ->

                StatusBarChipsModernization.unsafeAssertInNewMode()

                StatusBarChipsModernization.unsafeAssertInNewMode()





                logger.i({ "Chip clicked" }) {}

                logChipTapped(instanceId)

                uiEventLogger.logChipTapToShow(instanceId)





                // TODO(b/414830065): Tapping the call chip should show the notification instead

                // of launching the activity.

                val animationController =

                val animationController =

                    if (

                    if (

                        !StatusBarChipsReturnAnimations.isEnabled ||

                        !StatusBarChipsReturnAnimations.isEnabled ||
@@ -301,6 +315,17 @@ constructor( 
        )

        )

    }

    }





    private fun logChipTapped(instanceId: InstanceId?) {

        logger.i({ "Chip clicked" }) {}

        uiEventLogger.logChipTapToShow(instanceId)

    }



    private fun onCallChipTappedWithPromotionEnabled(notificationKey: String) {

        // The notification pipeline needs everything to run on the main thread, so keep

        // this event on the main thread.

        scope.launch { notifChipsInteractor.onPromotedNotificationChipTapped(notificationKey) }

    }



    private fun getContentDescription(appName: String): ContentDescription {

    private fun getContentDescription(appName: String): ContentDescription {

        val ongoingCallDescription = context.getString(R.string.ongoing_call_content_description)

        val ongoingCallDescription = context.getString(R.string.ongoing_call_content_description)

        return ContentDescription.Loaded(

        return ContentDescription.Loaded(

packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModelKosmos.kt

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.systemui.kosmos.Kosmos 
import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.plugins.activityStarter

import com.android.systemui.plugins.activityStarter

import com.android.systemui.statusbar.chips.call.domain.interactor.callChipInteractor

import com.android.systemui.statusbar.chips.call.domain.interactor.callChipInteractor

import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor

import com.android.systemui.statusbar.chips.statusBarChipsLogger

import com.android.systemui.statusbar.chips.statusBarChipsLogger

import com.android.systemui.statusbar.chips.uievents.statusBarChipsUiEventLogger

import com.android.systemui.statusbar.chips.uievents.statusBarChipsUiEventLogger

import com.android.systemui.util.time.fakeSystemClock

import com.android.systemui.util.time.fakeSystemClock
@@ -31,6 +32,7 @@ val Kosmos.callChipViewModel: CallChipViewModel by 
            applicationContext,

            applicationContext,

            scope = applicationCoroutineScope,

            scope = applicationCoroutineScope,

            interactor = callChipInteractor,

            interactor = callChipInteractor,

            notifChipsInteractor = statusBarNotificationChipsInteractor,

            systemClock = fakeSystemClock,

            systemClock = fakeSystemClock,

            activityStarter = activityStarter,

            activityStarter = activityStarter,

            logBuffer = statusBarChipsLogger,

            logBuffer = statusBarChipsLogger,