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

Commit 3d1a09c2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Call] Small re-organization of CallChipViewModel code 

This will make it easier to do a separate click listener if promoted
notification chips are enabled.

Bug: 364653005
Flag: EXEMPT refactor
Test: Trigger call chip with ui_rich_ongoing both on and off -> verify
it works as expected
Test: atest CallChipViewModelTest

Change-Id: I71f9dc6267ab3c64c546fc8eba7fd4c70eda9314
parent 95560907

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

+58 −65
Original line number Diff line number Diff line
@@ -210,31 +210,23 @@ constructor( 
        val instanceId = state.notificationInstanceId



        // This block mimics OngoingCallController#updateChip.

        val content =

            if (state.startTimeMs <= 0L) {

                // If the start time is invalid, don't show a timer and show just an icon.

                // See b/192379214.

            return OngoingActivityChipModel.Active(

                key = key,

                icon = icon,

                content = OngoingActivityChipModel.Content.IconOnly,

                colors = colors,

                onClickListenerLegacy = getOnClickListener(intent, instanceId),

                clickBehavior = getClickBehavior(intent, instanceId),

                isHidden = isHidden,

                transitionManager = getTransitionManager(state, transitionState),

                instanceId = instanceId,

            )

                OngoingActivityChipModel.Content.IconOnly

            } else {

                val startTimeInElapsedRealtime =

                state.startTimeMs - systemClock.currentTimeMillis() + systemClock.elapsedRealtime()

                    state.startTimeMs - systemClock.currentTimeMillis() +

                        systemClock.elapsedRealtime()

                OngoingActivityChipModel.Content.Timer(startTimeMs = startTimeInElapsedRealtime)

            }



        return OngoingActivityChipModel.Active(

            key = key,

            icon = icon,

            content = content,

            colors = colors,

                content =

                    OngoingActivityChipModel.Content.Timer(

                        startTimeMs = startTimeInElapsedRealtime

                    ),

            onClickListenerLegacy = getOnClickListener(intent, instanceId),

            clickBehavior = getClickBehavior(intent, instanceId),

            isHidden = isHidden,
@@ -242,13 +234,14 @@ constructor( 
            instanceId = instanceId,

        )

    }

    }



    private fun getOnClickListener(

        intent: PendingIntent?,

        instanceId: InstanceId?,

    ): View.OnClickListener? {

        if (intent == null) return null

        if (intent == null) {

            return null

        }

        return View.OnClickListener { view ->

            StatusBarChipsModernization.assertInLegacyMode()
@@ -273,11 +266,11 @@ constructor( 
    private fun getClickBehavior(

        intent: PendingIntent?,

        instanceId: InstanceId?,

    ): OngoingActivityChipModel.ClickBehavior =

    ): OngoingActivityChipModel.ClickBehavior {

        if (intent == null) {

            OngoingActivityChipModel.ClickBehavior.None

        } else {

            OngoingActivityChipModel.ClickBehavior.ExpandAction(

            return OngoingActivityChipModel.ClickBehavior.None

        }

        return OngoingActivityChipModel.ClickBehavior.ExpandAction(

            onClick = { expandable ->

                StatusBarChipsModernization.unsafeAssertInNewMode()