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

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

* commit '3ddd39b6f1e3bfa0b10443627dd14067502941dd':
  Don't add Quick Response menu if there's no mReplyFromAccount
This commit is contained in:
Tony Mantler 2013-10-31 14:15:46 -07:00 committed by Android Git Automerger
parent 0fe768e40c 3ddd39b6f1
commit a3e839cca9
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