PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use string notifications_disabled instead of off" into udc-dev am: 83c04b32d1 am: e6fe38f80c am: c608c84b81

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22938598

Change-Id: I22add623e327929d08ec9eec387907c1505e95b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kweku Adams
2023-05-01 17:38:43 +00:00
committed by Automerger Merge Worker
parent ff9e083367 c608c84b81
commit 058d4acb67
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/spa/notification/AppNotificationRepository.kt
View File

@@ -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(

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

@@ -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