Put Edit/Done into ActionBar
Change-Id: Id477e0d4ac768d068b5947ff6661d817f46cd921
diff --git a/res/menu/edit.xml b/res/menu/edit.xml
index 6fafbcf..997613e 100644
--- a/res/menu/edit.xml
+++ b/res/menu/edit.xml
@@ -19,7 +19,8 @@
android:id="@+id/menu_done"
android:alphabeticShortcut="\n"
android:icon="@android:drawable/ic_menu_save"
- android:title="@string/menu_done" />
+ android:title="@string/menu_done"
+ android:showAsAction="always" />
<item
android:id="@+id/menu_discard"
diff --git a/res/menu/view.xml b/res/menu/view.xml
index 428434d..7a1c26c 100644
--- a/res/menu/view.xml
+++ b/res/menu/view.xml
@@ -19,7 +19,8 @@
android:id="@+id/menu_edit"
android:icon="@android:drawable/ic_menu_edit"
android:title="@string/menu_editContact"
- android:alphabeticShortcut="e" />
+ android:alphabeticShortcut="e"
+ android:showAsAction="always" />
<item
android:id="@+id/menu_share"
diff --git a/src/com/android/contacts/views/detail/ContactDetailFragment.java b/src/com/android/contacts/views/detail/ContactDetailFragment.java
index 8bd465d..d5d11f1 100644
--- a/src/com/android/contacts/views/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/views/detail/ContactDetailFragment.java
@@ -826,16 +826,6 @@
}
@Override
- public void onPrepareOptionsMenu(Menu menu) {
- // Only allow edit when we have at least one raw_contact id
- final boolean hasRawContact = (mRawContactIds.size() > 0);
- menu.findItem(R.id.menu_edit).setEnabled(hasRawContact);
-
- // Only allow share when unrestricted contacts available
- menu.findItem(R.id.menu_share).setEnabled(!mAllRestricted);
- }
-
- @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_edit: {