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

Commit ea42ef17 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Pass context for Starred Contacts Summary 

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

Test: manual
Fixes: 138158873
Change-Id: I3d121fdfc7587870a86f7ad56f4efcbde664586d
parent 6c906dfa

src/com/android/settings/notification/ZenModeBackend.java

+3 −3
Original line number Diff line number Diff line
@@ -468,14 +468,14 @@ public class ZenModeBackend { 
        }

    }



    public String getStarredContactsSummary() {

    public String getStarredContactsSummary(Context context) {

        List<String> starredContacts = getStarredContacts();

        int numStarredContacts = starredContacts.size();



        List<String> displayContacts = new ArrayList<>();



        if (numStarredContacts == 0) {

            displayContacts.add(mContext.getString(R.string.zen_mode_from_none));

            displayContacts.add(context.getString(R.string.zen_mode_from_none));

        } else {

            for (int i = 0; i < 2 && i < numStarredContacts; i++) {

                displayContacts.add(starredContacts.get(i));
@@ -484,7 +484,7 @@ public class ZenModeBackend { 
            if (numStarredContacts == 3) {

                displayContacts.add(starredContacts.get(2));

            } else if (numStarredContacts > 2) {

                displayContacts.add(mContext.getResources().getQuantityString(

                displayContacts.add(context.getResources().getQuantityString(

                        R.plurals.zen_mode_starred_contacts_summary_additional_contacts,

                        numStarredContacts - 2, numStarredContacts - 2));

            }

src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class ZenModeStarredContactsPreferenceController extends 


    @Override

    public CharSequence getSummary() {

        return mBackend.getStarredContactsSummary();

        return mBackend.getStarredContactsSummary(mContext);

    }



    @Override

src/com/android/settings/notification/ZenRuleStarredContactsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class ZenRuleStarredContactsPreferenceController extends 


    @Override

    public CharSequence getSummary() {

        return mBackend.getStarredContactsSummary();

        return mBackend.getStarredContactsSummary(mContext);

    }



    @Override