Move "Edit" label option to overflow and rename to “Remove contacts”
Bug 30266214
Change-Id: Id450fa9fb461c72f81d5d96d905ac678c925a413
diff --git a/res/menu/view_group.xml b/res/menu/view_group.xml
index 69a4d85..24eb0b5 100644
--- a/res/menu/view_group.xml
+++ b/res/menu/view_group.xml
@@ -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"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f020308..7938844 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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>
diff --git a/src/com/android/contacts/activities/GroupMembersActivity.java b/src/com/android/contacts/activities/GroupMembersActivity.java
index 34b6b25..38fcb19 100644
--- a/src/com/android/contacts/activities/GroupMembersActivity.java
+++ b/src/com/android/contacts/activities/GroupMembersActivity.java
@@ -336,7 +336,7 @@
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);