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

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

Merge "Move "Edit" label option to overflow and rename to “Remove contacts”"... 

Merge "Move "Edit" label option to overflow and rename to “Remove contacts”" into ub-contactsdialer-f-dev
parents 4f3bcb45 9a717ec5

res/menu/view_group.xml

+2 −3
Original line number Diff line number Diff line
@@ -19,15 +19,14 @@ 


    <item

        android:id="@+id/menu_add"

        android:icon="@drawable/ic_person_add_tinted_24dp"

        android:icon="@drawable/ic_person_add_24dp"

        android:title="@string/menu_addToGroup"

        contacts:showAsAction="ifRoom" />



    <item

        android:id="@+id/menu_edit_group"

        android:icon="@drawable/ic_create_24dp"

        android:title="@string/menu_editGroup"

        contacts:showAsAction="ifRoom" />

        android:title="@string/menu_editGroup" />



    <item

        android:id="@+id/menu_rename_group"

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
    <string name="menu_splitAggregate">Unlink</string>



    <!-- Menu item that edits the currently selected label [CHAR LIMIT=30] -->

    <string name="menu_editGroup">Edit</string>

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



    <!-- Menu item to rename the currently selected label [CHAR LIMIT=30] -->

    <string name="menu_renameGroup">Rename label</string>

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

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ public class GroupMembersActivity extends ContactsDrawerActivity implements 
        final boolean isGroupEditable = mGroupMetadata != null && mGroupMetadata.editable;

        final boolean isGroupReadOnly = mGroupMetadata != null && mGroupMetadata.readOnly;



        setVisible(menu, R.id.menu_add, isGroupEditable && mIsEditMode);

        setVisible(menu, R.id.menu_add, isGroupEditable && !isSelectionMode);

        setVisible(menu, R.id.menu_rename_group, !isGroupReadOnly && !isSelectionMode);

        setVisible(menu, R.id.menu_delete_group, !isGroupReadOnly && !isSelectionMode);

        setVisible(menu, R.id.menu_edit_group, isGroupEditable && !mIsEditMode && !isSelectionMode);