diff --git a/res/menu-sw600dp/account_settings_add_account_option.xml b/res/menu-sw600dp/account_settings_add_account_option.xml
deleted file mode 100644
index dc274d81c..000000000
--- a/res/menu-sw600dp/account_settings_add_account_option.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
diff --git a/res/menu/account_settings_add_account_option.xml b/res/menu/account_settings_add_account_option.xml
deleted file mode 100644
index e93a17b67..000000000
--- a/res/menu/account_settings_add_account_option.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ddd117326..604575976 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -90,8 +90,6 @@
Refresh
- Add account
-
Compose
Search
diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
index 487f91b00..f54d277e6 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/AccountSettings.java
@@ -271,7 +271,7 @@ public class AccountSettings extends PreferenceActivity implements FeedbackEnabl
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
- getMenuInflater().inflate(R.menu.account_settings_add_account_option, menu);
+ getMenuInflater().inflate(R.menu.settings_menu, menu);
return true;
}
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index de0405e74..99e717f60 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -39,6 +39,8 @@ import android.provider.CalendarContract;
import android.provider.ContactsContract;
import android.provider.Settings;
import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuInflater;
import com.android.email.R;
import com.android.email.SecurityPolicy;
@@ -410,6 +412,12 @@ public class AccountSettingsFragment extends EmailPreferenceFragment
super.onSaveInstanceState(outState);
}
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ menu.clear();
+ inflater.inflate(R.menu.settings_fragment_menu, menu);
+ }
+
/**
* Activity provides callbacks here
*/