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

Pass context for Starred Contacts Summary

Browse Source 
So the correct context will be used to obtain the
correct translation for the summary string

Test: manual
Fixes: 138158873
Change-Id: I3d121fdfc7587870a86f7ad56f4efcbde664586d
This commit is contained in:
Beverly
2019-07-23 17:20:34 -04:00
committed by Beverly Tai
parent 6c906dfaa7
commit ea42ef17e6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/notification/ZenModeBackend.java
View File

@@ -468,14 +468,14 @@ public class ZenModeBackend {
} }
} }
public String getStarredContactsSummary() { public String getStarredContactsSummary(Context context) {
List<String> starredContacts = getStarredContacts(); List<String> starredContacts = getStarredContacts();
int numStarredContacts = starredContacts.size(); int numStarredContacts = starredContacts.size();
List<String> displayContacts = new ArrayList<>(); List<String> displayContacts = new ArrayList<>();
if (numStarredContacts == 0) { if (numStarredContacts == 0) {
displayContacts.add(mContext.getString(R.string.zen_mode_from_none)); displayContacts.add(context.getString(R.string.zen_mode_from_none));
} else { } else {
for (int i = 0; i < 2 && i < numStarredContacts; i++) { for (int i = 0; i < 2 && i < numStarredContacts; i++) {
displayContacts.add(starredContacts.get(i)); displayContacts.add(starredContacts.get(i));
@@ -484,7 +484,7 @@ public class ZenModeBackend {
if (numStarredContacts == 3) { if (numStarredContacts == 3) {
displayContacts.add(starredContacts.get(2)); displayContacts.add(starredContacts.get(2));
} else if (numStarredContacts > 2) { } else if (numStarredContacts > 2) {
displayContacts.add(mContext.getResources().getQuantityString( displayContacts.add(context.getResources().getQuantityString(
R.plurals.zen_mode_starred_contacts_summary_additional_contacts, R.plurals.zen_mode_starred_contacts_summary_additional_contacts,
numStarredContacts - 2, numStarredContacts - 2)); numStarredContacts - 2, numStarredContacts - 2));
} }

2
src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
View File

@@ -84,7 +84,7 @@ public class ZenModeStarredContactsPreferenceController extends
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mBackend.getStarredContactsSummary(); return mBackend.getStarredContactsSummary(mContext);
} }
@Override @Override

2
src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java
View File

@@ -83,7 +83,7 @@ public class ZenRuleStarredContactsPreferenceController extends
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mBackend.getStarredContactsSummary(); return mBackend.getStarredContactsSummary(mContext);
} }
@Override @Override