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

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

[SB] Remove status_bar_call_chip_notification_icon flag.

This flag was launched in 24Q4, which has been released for a month.

Bug: 354930838
Flag: EXEMPT launched flag removal
Test: Post call notification -> verify call chip has the notification
icon instead of a hard-coded phone icon

Change-Id: I38c061ec6f103aab7fa68de38bb2e3bc3b6da2ac
parent 2ccf4422
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -423,13 +423,6 @@ flag {
    }
}

flag {
    name: "status_bar_call_chip_notification_icon"
    namespace: "systemui"
    description: "Use the small icon set on the notification for the status bar call chip"
    bug: "354930838"
}

flag {
   name: "status_bar_signal_policy_refactor"
   namespace: "systemui"
+6 −86
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.platform.test.annotations.EnableFlags
import android.view.View
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.systemui.Flags.FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON
import com.android.systemui.SysuiTestCase
import com.android.systemui.common.shared.model.Icon
import com.android.systemui.coroutines.collectLastValue
@@ -126,65 +125,8 @@ class CallChipViewModelTest : SysuiTestCase() {
        }

    @Test
    @DisableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    fun chip_positiveStartTime_notifIconFlagOff_iconIsPhone() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

            repo.setOngoingCallState(
                inCallModel(startTimeMs = 1000, notificationIcon = createStatusBarIconViewOrNull())
            )

            assertThat((latest as OngoingActivityChipModel.Shown).icon)
                .isInstanceOf(OngoingActivityChipModel.ChipIcon.SingleColorIcon::class.java)
            val icon =
                (((latest as OngoingActivityChipModel.Shown).icon)
                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
                    .impl as Icon.Resource
            assertThat(icon.res).isEqualTo(com.android.internal.R.drawable.ic_phone)
            assertThat(icon.contentDescription).isNotNull()
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    @DisableFlags(StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_positiveStartTime_notifIconFlagOn_iconIsNotifIcon() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

            val notifIcon = createStatusBarIconViewOrNull()
            repo.setOngoingCallState(inCallModel(startTimeMs = 1000, notificationIcon = notifIcon))

            assertThat((latest as OngoingActivityChipModel.Shown).icon)
                .isInstanceOf(OngoingActivityChipModel.ChipIcon.StatusBarView::class.java)
            val actualIcon =
                (((latest as OngoingActivityChipModel.Shown).icon)
                        as OngoingActivityChipModel.ChipIcon.StatusBarView)
                    .impl
            assertThat(actualIcon).isEqualTo(notifIcon)
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON, StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_positiveStartTime_notifIconFlagOn_cdFlagOn_iconIsNotifKeyIcon() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

            repo.setOngoingCallState(
                inCallModel(
                    startTimeMs = 1000,
                    notificationIcon = createStatusBarIconViewOrNull(),
                    notificationKey = "notifKey",
                )
            )

            assertThat((latest as OngoingActivityChipModel.Shown).icon)
                .isEqualTo(OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon("notifKey"))
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON, StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_positiveStartTime_notifIconAndConnectedDisplaysFlagOn_iconIsNotifIcon() =
    @EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_positiveStartTime_connectedDisplaysFlagOn_iconIsNotifIcon() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

@@ -205,29 +147,8 @@ class CallChipViewModelTest : SysuiTestCase() {
        }

    @Test
    @DisableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    fun chip_zeroStartTime_notifIconFlagOff_iconIsPhone() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

            repo.setOngoingCallState(
                inCallModel(startTimeMs = 0, notificationIcon = createStatusBarIconViewOrNull())
            )

            assertThat((latest as OngoingActivityChipModel.Shown).icon)
                .isInstanceOf(OngoingActivityChipModel.ChipIcon.SingleColorIcon::class.java)
            val icon =
                (((latest as OngoingActivityChipModel.Shown).icon)
                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
                    .impl as Icon.Resource
            assertThat(icon.res).isEqualTo(com.android.internal.R.drawable.ic_phone)
            assertThat(icon.contentDescription).isNotNull()
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    @DisableFlags(StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_zeroStartTime_notifIconFlagOn_cdFlagOff_iconIsNotifIcon() =
    fun chip_zeroStartTime_cdFlagOff_iconIsNotifIcon() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

@@ -244,8 +165,8 @@ class CallChipViewModelTest : SysuiTestCase() {
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON, StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_zeroStartTime_notifIconFlagOn_cdFlagOn_iconIsNotifKeyIcon() =
    @EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_zeroStartTime_cdFlagOn_iconIsNotifKeyIcon() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)

@@ -262,7 +183,6 @@ class CallChipViewModelTest : SysuiTestCase() {
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    @DisableFlags(StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_notifIconFlagOn_butNullNotifIcon_cdFlagOff_iconIsPhone() =
        testScope.runTest {
@@ -281,7 +201,7 @@ class CallChipViewModelTest : SysuiTestCase() {
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON, StatusBarConnectedDisplays.FLAG_NAME)
    @EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)
    fun chip_notifIconFlagOn_butNullNotifIcon_iconNotifKey() =
        testScope.runTest {
            val latest by collectLastValue(underTest.chip)
+1 −23
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.view.View
import android.widget.LinearLayout
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.systemui.Flags.FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON
import com.android.systemui.Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS
import com.android.systemui.SysuiTestCase
import com.android.systemui.concurrency.fakeExecutor
@@ -158,28 +157,7 @@ class OngoingCallControllerTest : SysuiTestCase() {
        }

    @Test
    @DisableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    fun interactorHasOngoingCallNotif_notifIconFlagOff_repoHasNoNotifIcon() =
        testScope.runTest {
            val icon = mock<StatusBarIconView>()
            setNotifOnRepo(
                activeNotificationModel(
                    key = "ongoingNotif",
                    callType = CallType.Ongoing,
                    uid = CALL_UID,
                    statusBarChipIcon = icon,
                    whenTime = 567,
                )
            )

            val repoState = ongoingCallRepository.ongoingCallState.value
            assertThat(repoState).isInstanceOf(OngoingCallModel.InCall::class.java)
            assertThat((repoState as OngoingCallModel.InCall).notificationIconView).isNull()
        }

    @Test
    @EnableFlags(FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON)
    fun interactorHasOngoingCallNotif_notifIconFlagOn_repoHasNotifIcon() =
    fun interactorHasOngoingCallNotif_repoHasNotifIcon() =
        testScope.runTest {
            val icon = mock<StatusBarIconView>()

+2 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.chips.call.ui.viewmodel

import android.view.View
import com.android.internal.jank.InteractionJankMonitor
import com.android.systemui.Flags
import com.android.systemui.animation.ActivityTransitionAnimator
import com.android.systemui.common.shared.model.ContentDescription
import com.android.systemui.common.shared.model.Icon
@@ -64,18 +63,12 @@ constructor(
                    is OngoingCallModel.InCallWithVisibleApp -> OngoingActivityChipModel.Hidden()
                    is OngoingCallModel.InCall -> {
                        val icon =
                            if (
                                Flags.statusBarCallChipNotificationIcon() &&
                                    state.notificationIconView != null
                            ) {
                            if (state.notificationIconView != null) {
                                StatusBarConnectedDisplays.assertInLegacyMode()
                                OngoingActivityChipModel.ChipIcon.StatusBarView(
                                    state.notificationIconView
                                )
                            } else if (
                                StatusBarConnectedDisplays.isEnabled &&
                                    Flags.statusBarCallChipNotificationIcon()
                            ) {
                            } else if (StatusBarConnectedDisplays.isEnabled) {
                                OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon(
                                    state.notificationKey
                                )
+0 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.systemui.statusbar.chips.ui.model

import android.view.View
import com.android.systemui.Flags
import com.android.systemui.common.shared.model.Icon
import com.android.systemui.statusbar.StatusBarIconView
import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips
@@ -130,10 +129,6 @@ sealed class OngoingActivityChipModel {
         */
        data class StatusBarView(val impl: StatusBarIconView) : ChipIcon {
            init {
                check(Flags.statusBarCallChipNotificationIcon()) {
                    "OngoingActivityChipModel.ChipIcon.StatusBarView created even though " +
                        "Flags.statusBarCallChipNotificationIcon is not enabled"
                }
                StatusBarConnectedDisplays.assertInLegacyMode()
            }
        }
Loading