ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Don't add Quick Response menu if there's no mReplyFromAccount" into jb-ub-mail-ur10

Browse Source
This commit is contained in:
Tony Mantler 2013-10-31 21:11:32 +00:00 committed by Android (Google) Code Review
commit 3ddd39b6f1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/email/activity/ComposeActivityEmail.java
View File

@ -24,15 +24,21 @@ import android.widget.EditText;
import com.android.email.R;
import com.android.mail.compose.ComposeActivity;
import com.android.mail.utils.LogUtils;
public class ComposeActivityEmail extends ComposeActivity
implements InsertQuickResponseDialog.Callback {
static final String insertQuickResponseDialogTag = "insertQuickResponseDialog";
@Override
public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.email_compose_menu_extras, menu);
return true;
final boolean superCreated = super.onCreateOptionsMenu(menu);
if (mReplyFromAccount != null) {
getMenuInflater().inflate(R.menu.email_compose_menu_extras, menu);
return true;
} else {
LogUtils.d(LogUtils.TAG, "mReplyFromAccount is null, not adding Quick Response menu");
return superCreated;
}
}
@Override