diff options
author | Jin Cao <jinyan@google.com> | 2014-08-20 22:44:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-19 02:43:23 +0000 |
commit | ac4f8c5b5aaa716c565358204031fe96851141fa (patch) | |
tree | 02cbd5d45404b5da608f0cb2915d4ba0b8715444 | |
parent | da2e3b2f07225c8c183c3d3890ad575e18d1b6d0 (diff) | |
parent | f0a0b4c82081018441b34b731da464914605ee64 (diff) | |
download | android_packages_apps_UnifiedEmail-ac4f8c5b5aaa716c565358204031fe96851141fa.tar.gz android_packages_apps_UnifiedEmail-ac4f8c5b5aaa716c565358204031fe96851141fa.tar.bz2 android_packages_apps_UnifiedEmail-ac4f8c5b5aaa716c565358204031fe96851141fa.zip |
Merge "Separate string for Compose action bar title" into ub-gmail-ur14-dev
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/mail/compose/ComposeActivity.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 67af422b0..2fd809c0a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -56,6 +56,8 @@ <string name="discard">Discard</string> <!-- The possible ways to reply to a message [CHAR LIMIT=15] --> <string name="compose">Compose</string> + <!-- The action bar title for the default compose mode [CHAR LIMIT=10] --> + <string name="compose_title">Compose</string> <!-- The possible ways to reply to a message [CHAR LIMIT=15] --> <string-array name="compose_modes"> <!-- Reply --> diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java index af53fb959..d05dfe10c 100644 --- a/src/com/android/mail/compose/ComposeActivity.java +++ b/src/com/android/mail/compose/ComposeActivity.java @@ -1423,7 +1423,7 @@ public class ComposeActivity extends ActionBarActivity } if (mComposeMode == ComposeActivity.COMPOSE) { actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); - actionBar.setTitle(R.string.compose); + actionBar.setTitle(R.string.compose_title); } else { actionBar.setTitle(null); if (mComposeModeAdapter == null) { |