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

Commit 83c04b32 authored by Kweku Adams's avatar Kweku Adams Committed by Android (Google) Code Review
Browse files

Merge "Use string notifications_disabled instead of off" into udc-dev

parents d7bbff00 ca615997

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