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

Merge "Slight reordering and add settings to compose menu"

This commit is contained in:
Ben Komalo 2011-08-22 15:44:58 -07:00 committed by Android (Google) Code Review
parent d7f5d0f976 4520d35e7c
commit b1a4f9d562
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/menu-sw600dp/message_compose_option.xml
View File

@ -44,5 +44,11 @@
android:title="@string/show_quick_text_list_dialog_action"
android:alphabeticShortcut="r"
/>
<item
android:id="@+id/settings"
android:orderInCategory="2000"
android:title="@string/settings_action"
android:icon="@android:drawable/ic_menu_preferences"
/>
</menu>

13
res/menu/message_compose_option.xml
View File

@ -22,15 +22,15 @@
android:icon="@drawable/ic_menu_send_holo_light"
android:alphabeticShortcut="s"
/>
<item
android:id="@+id/add_attachment"
android:title="@string/add_attachment_menu"
/>
<item
android:id="@+id/add_cc_bcc"
android:icon="@drawable/ic_menu_cc_holo_light"
android:title="@string/add_cc_bcc_menu"
/>
<item
android:id="@+id/add_attachment"
android:title="@string/add_attachment_menu"
/>
<item
android:id="@+id/save"
android:title="@string/save_draft_action"
@ -47,4 +47,9 @@
android:title="@string/show_quick_text_list_dialog_action"
android:alphabeticShortcut="r"
/>
<item
android:id="@+id/settings"
android:title="@string/settings_action"
android:icon="@android:drawable/ic_menu_preferences"
/>
</menu>

4
src/com/android/email/activity/MessageCompose.java
View File

@ -63,6 +63,7 @@ import com.android.email.EmailAddressAdapter;
import com.android.email.EmailAddressValidator;
import com.android.email.R;
import com.android.email.RecipientAdapter;
import com.android.email.activity.setup.AccountSettings;
import com.android.email.mail.internet.EmailHtmlUtil;
import com.android.emailcommon.Logging;
import com.android.emailcommon.internet.MimeUtility;
@ -1741,6 +1742,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
case R.id.add_attachment:
onAddAttachment();
return true;
case R.id.settings:
AccountSettings.actionSettings(this, mAccount.mId);
return true;
}
return false;
}