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

Commit ca615997 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Use string notifications_disabled instead of off 

notifications_disabled was changed to off in
Change: I5f84d09f223efd478461ded93aeac82bf7b128d8

And reverted from off to notifications_disabled in
Change: Iaad301c5513478fb95e40987ea3ccb4f923d71fa

This usage is branched from AppNotificationPreferenceController.java,
and missed in revert.

Bug: 272603842
Test: Visual
Test: Unit test
Change-Id: I5b8466134c1342e10de7a2ead8c52931e0c19377
parent 24666c97

src/com/android/settings/spa/notification/AppNotificationRepository.kt

+4 −2
Original line number Diff line number Diff line
@@ -123,13 +123,15 @@ class AppNotificationRepository( 
    }



    override fun getNotificationSummary(app: ApplicationInfo): String {

        if (!isEnabled(app)) return context.getString(R.string.off)

        if (!isEnabled(app)) return context.getString(R.string.notifications_disabled)

        val channelCount = getChannelCount(app)

        if (channelCount == 0) {

            return calculateFrequencySummary(getSentCount(app))

        }

        val blockedChannelCount = getBlockedChannelCount(app)

        if (channelCount == blockedChannelCount) return context.getString(R.string.off)

        if (channelCount == blockedChannelCount) {

            return context.getString(R.string.notifications_disabled)

        }

        val frequencySummary = calculateFrequencySummary(getSentCount(app))

        if (blockedChannelCount == 0) return frequencySummary

        return context.getString(

tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ class AppNotificationRepositoryTest { 


        val summary = repository.getNotificationSummary(APP)



        assertThat(summary).isEqualTo(context.getString(R.string.off))

        assertThat(summary).isEqualTo(context.getString(R.string.notifications_disabled))

    }



    @Test
@@ -273,7 +273,7 @@ class AppNotificationRepositoryTest { 


        val summary = repository.getNotificationSummary(APP)



        assertThat(summary).isEqualTo(context.getString(R.string.off))

        assertThat(summary).isEqualTo(context.getString(R.string.notifications_disabled))

    }



    @Test