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

am c6f8c51c: Prompt for auto-advance option on first action

Browse Source 
* commit 'c6f8c51c67e7fff35dce86721b2273d7dd190ae0':
  Prompt for auto-advance option on first action
This commit is contained in:
Scott Kennedy 2012-11-02 10:29:10 -07:00 committed by Android Git Automerger
commit d764f16ca5
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emailcommon/Android.mk
View File

@ -20,10 +20,12 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
unified_email_unified_src_dir := ../../UnifiedEmail/unified_src
unified_email_src_dir := ../../UnifiedEmail/src unified_email_src_dir := ../../UnifiedEmail/src
apache_src_dir := ../../UnifiedEmail/src/org apache_src_dir := ../../UnifiedEmail/src/org
imported_unified_email_files := \ imported_unified_email_files := \
$(unified_email_unified_src_dir)/com/android/mail/utils/LogTag.java \
$(unified_email_src_dir)/com/android/mail/utils/LogUtils.java \ $(unified_email_src_dir)/com/android/mail/utils/LogUtils.java \
$(unified_email_src_dir)/com/android/mail/providers/UIProvider.java $(unified_email_src_dir)/com/android/mail/providers/UIProvider.java

25
res/values/strings.xml
View File

@ -1122,15 +1122,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- First category in general preferences [CHAR LIMIT=64] --> <!-- First category in general preferences [CHAR LIMIT=64] -->
<string name="category_general_preferences">Application</string> <string name="category_general_preferences">Application</string>
<!-- General preference: Label of the setting for the direction to move to
when deleting the current message.
Options contain "newer message","older message", etc. [CHAR LIMIT=32] -->
<string name="general_preference_auto_advance_label">Auto-advance</string>
<!-- General preference: Description of the setting for the direction to move to
when deleting the current message.
Options contain "newer message","older message", etc. [CHAR LIMIT=64] -->
<string name="general_preference_auto_advance_summary">Choose which screen to show after you
delete a message</string>
<!-- General preference: Label of the setting for hiding checkboxes in the <!-- General preference: Label of the setting for hiding checkboxes in the
message list [CHAR LIMIT=32] --> message list [CHAR LIMIT=32] -->
<string name="general_preference_hide_checkboxes_label">Hide checkboxes</string> <string name="general_preference_hide_checkboxes_label">Hide checkboxes</string>
@ -1154,22 +1145,6 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- General preference: Description of the setting for requiring confirmation before <!-- General preference: Description of the setting for requiring confirmation before
message sending [CHAR LIMIT=32] --> message sending [CHAR LIMIT=32] -->
<string name="general_preference_confirm_send_summary">Messages</string> <string name="general_preference_confirm_send_summary">Messages</string>
<!-- General preference: Title of the dialog box containing options for setting for
the direction to move to when deleting the current message.
Options contain "newer message","older message", etc. [CHAR LIMIT=32] -->
<string name="general_preference_auto_advance_dialog_title">Advance to</string>
<!-- General preference: Option for the setting for
the direction to move to when deleting the current message.
This option is for "move to the newer message" [CHAR LIMIT=32] -->
<string name="general_preference_auto_advance_newer">Newer message</string>
<!-- General preference: Option for the setting for
the direction to move to when deleting the current message.
This option is for "move to the older message" [CHAR LIMIT=32] -->
<string name="general_preference_auto_advance_older">Older message</string>
<!-- General preference: Option for the setting for
the direction to move to when deleting the current message.
This option is for "move back to the message list" [CHAR LIMIT=32] -->
<string name="general_preference_auto_advance_message_list">Message list</string>
<!-- General preference: Label of the setting for the text zoom. [CHAR LIMIT=32] --> <!-- General preference: Label of the setting for the text zoom. [CHAR LIMIT=32] -->
<string name="general_preference_text_zoom_label">Message text size</string> <string name="general_preference_text_zoom_label">Message text size</string>