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

Commit 6202e983 authored by Walter Jang's avatar Walter Jang Committed by Android (Google) Code Review
Browse files

Merge "Change the title of GroupMembersActivity when removing contacts" into... 

Merge "Change the title of GroupMembersActivity when removing contacts" into ub-contactsdialer-f-dev
parents 0448d97f d7725159

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -677,8 +677,8 @@ 
    <!-- Label to instruct the user to type in a contact's name to add the contact as a member of the current group. [CHAR LIMIT=64] -->

    <string name="enter_contact_name">Search contacts</string>



    <!-- Title of edit label view  [CHAR LIMIT=20]-->

    <string name="title_edit_group">Edit Label: <xliff:g id="group_name" example="Friends">%1$s</xliff:g></string>

    <!-- Title of the edit label view in selection mode when contacts are being selected for removal.[CHAR LIMIT=40] -->

    <string name="title_edit_group">Remove contacts</string>



    <!-- Header label in the contact editor for a profile that is local to the device only (and not associated with any account) [CHAR LIMIT=25] -->

    <string name="local_profile_title">My local profile</string>

src/com/android/contacts/activities/GroupMembersActivity.java

+2 −4
Original line number Diff line number Diff line
@@ -492,8 +492,7 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements 
                if (mMembersFragment != null) {

                    if (mIsEditMode) {

                        mMembersFragment.displayDeleteButtons(true);

                        mActionBarAdapter.setActionBarTitle(

                                getString(R.string.title_edit_group, mGroupMetadata.groupName));

                        mActionBarAdapter.setActionBarTitle(getString(R.string.title_edit_group));

                    } else {

                        mMembersFragment.displayCheckBoxes(true);

                    }
@@ -542,8 +541,7 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements 
    @Override

    public void onSelectedContactIdsChanged() {

        if (mIsEditMode) {

            mActionBarAdapter.setActionBarTitle(

                    getString(R.string.title_edit_group, mGroupMetadata.groupName));

            mActionBarAdapter.setActionBarTitle(getString(R.string.title_edit_group));

        } else {

            mActionBarAdapter.setSelectionCount(mMembersFragment.getSelectedContactIds().size());

        }