diff options
| author | Jin Cao <jinyan@google.com> | 2014-07-25 22:47:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-25 21:16:23 +0000 |
| commit | a42d98e57dfef340af3fa8f0223d444ecc7cf5c4 (patch) | |
| tree | 22f3f3e22d517858dcfdadc118b0c387ee5f6a13 /src | |
| parent | 2d86d1123c4183024222dd2eb60f7cbdc24953fd (diff) | |
| parent | f8c02b689a62bcbbf9a5a565c283ddb6a33b6fd1 (diff) | |
| download | android_packages_apps_UnifiedEmail-a42d98e57dfef340af3fa8f0223d444ecc7cf5c4.tar.gz android_packages_apps_UnifiedEmail-a42d98e57dfef340af3fa8f0223d444ecc7cf5c4.tar.bz2 android_packages_apps_UnifiedEmail-a42d98e57dfef340af3fa8f0223d444ecc7cf5c4.zip | |
Merge "[Quantum] update compose action menu" into ub-mail-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/compose/ComposeActivity.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java index 7a01750c1..dd8aab9c1 100644 --- a/src/com/android/mail/compose/ComposeActivity.java +++ b/src/com/android/mail/compose/ComposeActivity.java @@ -2287,24 +2287,6 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi } @Override - public boolean onPrepareOptionsMenu(Menu menu) { - MenuItem ccBcc = menu.findItem(R.id.add_cc_bcc); - if (ccBcc != null && mCc != null) { - // Its possible there is a menu item OR a button. - boolean ccFieldVisible = mCc.isShown(); - boolean bccFieldVisible = mBcc.isShown(); - if (!ccFieldVisible || !bccFieldVisible) { - ccBcc.setVisible(true); - ccBcc.setTitle(getString(!ccFieldVisible ? R.string.add_cc_label - : R.string.add_bcc_label)); - } else { - ccBcc.setVisible(false); - } - } - return true; - } - - @Override public boolean onOptionsItemSelected(MenuItem item) { final int id = item.getItemId(); @@ -2316,8 +2298,6 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi doAttach(MIME_TYPE_ALL); } else if (id == R.id.add_photo_attachment) { doAttach(MIME_TYPE_PHOTO); - } else if (id == R.id.add_cc_bcc) { - showCcBccViews(); } else if (id == R.id.save) { doSave(true); } else if (id == R.id.send) { |