Fix b/10457328 by making "many" string a plural.
Change-Id: I4d7ae2931cf57e36d7bb5230fc16866000d560b4
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61fd7fa..d17e9ab 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -442,8 +442,10 @@
<!-- New Message notification text that appears over conversation view on incoming message. [CHAR LIMIT=30] -->
<string name="new_incoming_messages_one">New message from <xliff:g id="sender">%s</xliff:g>. Show.</string>
- <!-- New Message notification text that appears over conversation view on incoming messages. [CHAR LIMIT=30] -->
- <string name="new_incoming_messages_many"><xliff:g id="count">%1$d</xliff:g> new messages. Show.</string>
+ <!-- New Message notification text that appears over conversation view on incoming messages. Will only be used if there is more than one new message. [CHAR LIMIT=30] -->
+ <plurals name="new_incoming_messages_many">
+ <item quantity="other"><xliff:g id="count">%1$d</xliff:g> new messages. Show.</item>
+ </plurals>
<!-- Conversation message header strings -->
<!-- Icon name for expanding recipient details in a message when viewing it. [CHAR LIMIT=40] -->
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index c6ff60b..98cbaae 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -1270,7 +1270,7 @@
public String getNotificationText() {
Resources res = getResources();
if (count > 1) {
- return res.getString(R.string.new_incoming_messages_many, count);
+ return res.getQuantityString(R.plurals.new_incoming_messages_many, count, count);
} else {
final Address addr = getAddress(senderAddress);
return res.getString(R.string.new_incoming_messages_one,