summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-07-08 17:26:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-08 17:26:31 +0000
commit7baf9db8e938cfd39aac8de0c44bf3b2101b4392 (patch)
treeb1c73a67a49c27b3641819b8cfe7b431998444cf /src/com/android
parentd1c2cdcde6d2a65089ebb63a9e9a538d48f72ec5 (diff)
parent91bc7980041628fb807ee19f5588abe5615be26b (diff)
downloadandroid_packages_apps_PackageInstaller-7baf9db8e938cfd39aac8de0c44bf3b2101b4392.tar.gz
android_packages_apps_PackageInstaller-7baf9db8e938cfd39aac8de0c44bf3b2101b4392.tar.bz2
android_packages_apps_PackageInstaller-7baf9db8e938cfd39aac8de0c44bf3b2101b4392.zip
Merge "Make "1 more" a plurals for translation purposes" into mnc-dev
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java5
-rw-r--r--src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index 52a2c8e1..03be3915 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -244,8 +244,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader
return true;
}
});
- extraPerms.setSummary(getString(R.string.additional_permissions_more,
- mExtraScreen.getPreferenceCount()));
+ int count = mExtraScreen.getPreferenceCount();
+ extraPerms.setSummary(getResources().getQuantityString(
+ R.plurals.additional_permissions_more, count, count));
screen.addPreference(extraPerms);
}
if (screen.getPreferenceCount() != 0) {
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
index a814550c..051676a8 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsFragment.java
@@ -254,8 +254,9 @@ public final class ManagePermissionsFragment extends PermissionsFrameFragment
return true;
}
});
- extraScreenPreference.setSummary(getString(R.string.additional_permissions_more,
- mExtraScreen.getPreferenceCount()));
+ int count = mExtraScreen.getPreferenceCount();
+ extraScreenPreference.setSummary(getResources().getQuantityString(
+ R.plurals.additional_permissions_more, count, count));
screen.addPreference(extraScreenPreference);
}
if (screen.getPreferenceCount() != 0) {