diff options
| author | Andrew Sapperstein <asapperstein@google.com> | 2014-08-07 10:45:57 -0700 |
|---|---|---|
| committer | Andrew Sapperstein <asapperstein@google.com> | 2014-08-07 11:23:12 -0700 |
| commit | 455565180998047c4706582da0509b0cb8464e64 (patch) | |
| tree | e4f4399b2e5595313f55071c50853cffdf06f894 /src | |
| parent | c9048ec301944e9e52a2cef49d9f13a45291a889 (diff) | |
| download | android_packages_apps_UnifiedEmail-455565180998047c4706582da0509b0cb8464e64.tar.gz android_packages_apps_UnifiedEmail-455565180998047c4706582da0509b0cb8464e64.tar.bz2 android_packages_apps_UnifiedEmail-455565180998047c4706582da0509b0cb8464e64.zip | |
Cleanup AccountFeedbackActivity's actions.
Change-Id: I374d4c1826de94729722d19996022435d9f97e6d
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/ui/AccountFeedbackActivity.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/com/android/mail/ui/AccountFeedbackActivity.java b/src/com/android/mail/ui/AccountFeedbackActivity.java index cdf23d532..1567b4b20 100644 --- a/src/com/android/mail/ui/AccountFeedbackActivity.java +++ b/src/com/android/mail/ui/AccountFeedbackActivity.java @@ -45,8 +45,7 @@ public abstract class AccountFeedbackActivity extends ActionBarActivity private static final String SAVED_ACCOUNT = "saved-account"; - private MenuItem mHelpItem; - private MenuItem mSendFeedbackItem; + private MenuItem mHelpAndFeedbackItem; protected Uri mAccountUri; protected Account mAccount; @@ -93,23 +92,18 @@ public abstract class AccountFeedbackActivity extends ActionBarActivity } getMenuInflater().inflate(R.menu.account_feedback_menu, menu); - mHelpItem = menu.findItem(R.id.help_info_menu_item); - mSendFeedbackItem = menu.findItem(R.id.feedback_menu_item); + mHelpAndFeedbackItem = menu.findItem(R.id.help_info_menu_item); return true; } @Override public boolean onPrepareOptionsMenu(Menu menu) { - if (mHelpItem != null) { - mHelpItem.setVisible(mAccount != null + if (mHelpAndFeedbackItem != null) { + mHelpAndFeedbackItem.setVisible(mAccount != null && mAccount.supportsCapability(UIProvider.AccountCapabilities.HELP_CONTENT)); } - if (mSendFeedbackItem != null) { - mSendFeedbackItem.setVisible(mAccount != null - && mAccount.supportsCapability(UIProvider.AccountCapabilities.SEND_FEEDBACK)); - } - return true; + return super.onPrepareOptionsMenu(menu); } @Override @@ -121,8 +115,6 @@ public abstract class AccountFeedbackActivity extends ActionBarActivity Utils.showSettings(this, mAccount); } else if (itemId == R.id.help_info_menu_item) { Utils.showHelp(this, mAccount, getString(R.string.main_help_context)); - } else if (itemId == R.id.feedback_menu_item) { - Utils.sendFeedback(this, mAccount, false); } else { return super.onOptionsItemSelected(item); } |