Merge "Use the plural format for "See all COUNT apps"" into rvc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 437a3bd..910aba4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4289,7 +4289,10 @@
<!-- Category title listing recently used apps [CHAR_LIMIT=50]-->
<string name="recent_app_category_title">Recently opened apps</string>
<!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
- <string name="see_all_apps_title">See all <xliff:g id="count" example="3">%1$d</xliff:g> apps</string>
+ <plurals name="see_all_apps_title">
+ <item quantity="one">See all apps</item>
+ <item quantity="other">See all %1$d apps</item>
+ </plurals>
<!-- Title of the dialog that asks the user to contact the IT admin to reset password [CHAR LIMIT=40] -->
<string name="forgot_password_title">Contact your IT admin</string>
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index 69a68ef..20f9806 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -117,7 +117,8 @@
@Override
protected void onCountComplete(int num) {
mAppEntitiesController.setHeaderDetails(
- mContext.getString(R.string.see_all_apps_title, num));
+ mContext.getResources().getQuantityString(R.plurals.see_all_apps_title,
+ num, num));
mAppEntitiesController.apply();
}
}.execute();