summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-03 22:52:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-03 22:52:56 -0700
commit3a308dc957f4da9de045fb65bdee41570bbd45d4 (patch)
treea75439e5b84c5febfc8a5a6066fab63b6301e68c /res
parentf48ece688d480eb16df5196d1dda2245b3b78fe4 (diff)
parent5fcbaf9b4f1ad5c77afccd9e9c2c812b59c7f16a (diff)
downloadandroid_packages_apps_Email-3a308dc957f4da9de045fb65bdee41570bbd45d4.tar.gz
android_packages_apps_Email-3a308dc957f4da9de045fb65bdee41570bbd45d4.tar.bz2
android_packages_apps_Email-3a308dc957f4da9de045fb65bdee41570bbd45d4.zip
Merge "Email: Support Email signature with brand."
Diffstat (limited to 'res')
-rw-r--r--res/values/constants.xml3
-rw-r--r--res/values/strings.xml2
2 files changed, 5 insertions, 0 deletions
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 515cef50d..082b86554 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -37,4 +37,7 @@
<!-- Boolean value indicating whether we should allow force create account -->
<bool name="enable_force_configure_account">false</bool>
+
+ <!-- Boolean value to show Customize Email signature with brand -->
+ <bool name="config_email_signature_with_brand">false</bool>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ddabb35e7..46852ade0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -745,4 +745,6 @@
<string name="default_ninteenth_eas_name" translatable="false">Default Ninteenth</string>
<string name="account_manager_type_default_twentith" translatable="false">com.android.email.default.twentith</string>
<string name="default_twentith_eas_name" translatable="false">Default Twentith</string>
+ <!-- string to show Email signature with brand -->
+ <string name="default_email_signature_with_brand"></string>
</resources>