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

Merge "Fix notification preferences" into qt-dev

Browse Source 
am: 42eefd0d7e

Change-Id: I177e26feac7fd555e9e86c4bc730764a993e36bb
This commit is contained in:
Julia Reynolds
2019-04-25 00:08:26 -07:00
committed by android-build-merger
parent 81183f3af6 42eefd0d7e
commit 953bb4514c
6 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
View File

@@ -397,9 +397,21 @@ public class AppStateNotificationBridgeTest {
assertThat(AppStateNotificationBridge.getSummary(
mContext, sentRarely, R.id.sort_order_frequent_notification).toString())
.contains("1");
assertThat(AppStateNotificationBridge.getSummary(
mContext, sentRarely, R.id.sort_order_frequent_notification).toString())
.contains("notification ");
assertThat(AppStateNotificationBridge.getSummary(
mContext, sentRarely, R.id.sort_order_frequent_notification).toString())
.contains("week");
assertThat(AppStateNotificationBridge.getSummary(
mContext, sentOften, R.id.sort_order_frequent_notification).toString())
.contains("8");
assertThat(AppStateNotificationBridge.getSummary(
mContext, sentOften, R.id.sort_order_frequent_notification).toString())
.contains("notifications");
assertThat(AppStateNotificationBridge.getSummary(
mContext, sentOften, R.id.sort_order_frequent_notification).toString())
.contains("day");
}
@Test

3
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSliceTest.java
View File

@@ -151,7 +151,8 @@ public class NotificationChannelSliceTest {
for (int i = 0; i < rowItems.size(); i++) {
// Assert the summary text is the same as expectation.
assertThat(getSummaryFromSliceItem(rowItems.get(i))).isEqualTo(
mContext.getString(R.string.notifications_sent_weekly, CHANNEL_COUNT - i));
mContext.getResources().getQuantityString(R.plurals.notifications_sent_weekly,
CHANNEL_COUNT - i, CHANNEL_COUNT - i));
}
}