Merge "Move values over from mailcommon to unifiedemail." into jb-ub-mail
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 0b255ed..61be055 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -69,4 +69,6 @@
<!-- Whether to display folder colors in the widget -->
<bool name="display_folder_colors_in_widget">false</bool>
+
+ <integer name="max_num_notification_digest_items">10</integer>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3147c95..f2c5e0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -695,4 +695,12 @@
come from different accounts -->
<string name="cant_move_or_change_labels">Can\'t move because selection contains multiple
accounts.</string>
+
+ <!-- Format string used when displaying a summary in a message summary in list notification that was triggered by several new conversations.
+ Extra space between sender and subject is intentional. [CHAR LIMIT=120] -->
+ <string name="multiple_new_message_notification_item"><b><xliff:g id="sender">%1$s</xliff:g></b>\u0020\u0020\u0020<xliff:g id="subject">%2$s</xliff:g></string>
+
+ <!-- Format string used when displaying the big text of a notification that was triggered by a single new conversation. [CHAR LIMIT=120] -->
+ <string name="single_new_message_notification_big_text"><xliff:g id="subject">%1$s</xliff:g>\n<xliff:g id="snippet">%2$s</xliff:g></string>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a37e6d8..94eb701 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -398,5 +398,10 @@
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
</style>
+ <style name="NotificationPrimaryText">
+ <item name="android:textColor">#cccccc</item>
+ </style>
+ <style name="NotificationSecondaryText">
+ </style>
</resources>