summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYu Ping Hu <yph@google.com>2013-07-30 18:30:33 -0700
committerYu Ping Hu <yph@google.com>2013-07-30 18:51:01 -0700
commitef0d98155c95b22f7d8516eaaa8113e12bb7cbba (patch)
treee87423ce5455bbf0e7b6c779f1976f1ae330ac3e /src
parent82e2830a7fad7a4bbfc99f1ea59034f0b2808033 (diff)
downloadandroid_packages_apps_Email-ef0d98155c95b22f7d8516eaaa8113e12bb7cbba.tar.gz
android_packages_apps_Email-ef0d98155c95b22f7d8516eaaa8113e12bb7cbba.tar.bz2
android_packages_apps_Email-ef0d98155c95b22f7d8516eaaa8113e12bb7cbba.zip
Fix settings menus.
- Account & general fragments need to clear to remove "Add account" for phone & 7". - 10" needs to therefore specify their menus in order to have "Add account". Bug: 10097087 Change-Id: I133db9b9f7f6610ae30b46927ffcb8a9e4df4c0a
Diffstat (limited to 'src')
-rw-r--r--src/com/android/email/activity/setup/AccountSettingsFragment.java1
-rw-r--r--src/com/android/email/activity/setup/GeneralPreferences.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index c84e244e9..d8db49099 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -413,6 +413,7 @@ public class AccountSettingsFragment extends EmailPreferenceFragment
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ menu.clear();
inflater.inflate(R.menu.settings_fragment_menu, menu);
}
diff --git a/src/com/android/email/activity/setup/GeneralPreferences.java b/src/com/android/email/activity/setup/GeneralPreferences.java
index 5555db2b0..c335dd456 100644
--- a/src/com/android/email/activity/setup/GeneralPreferences.java
+++ b/src/com/android/email/activity/setup/GeneralPreferences.java
@@ -194,6 +194,7 @@ public class GeneralPreferences extends EmailPreferenceFragment implements
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ menu.clear();
inflater.inflate(R.menu.general_prefs_fragment_menu, menu);
}