Merge "Show list of permissions instead of just numbers" into mnc-dev

This commit is contained in:
Makoto Onuki
2015-06-10 16:39:06 +00:00
committed by Android (Google) Code Review
4 changed files with 60 additions and 20 deletions

View File

@@ -129,13 +129,13 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
private final PermissionsResultCallback mPermissionCallback = new PermissionsResultCallback() {
@Override
public void onPermissionCountResult(int[] result) {
public void onPermissionSummaryResult(int[] counts, CharSequence[] groupLabels) {
if (getActivity() == null) {
return;
}
if (result != null) {
if (counts != null) {
mAppPermsPreference.setSummary(getContext().getString(
R.string.app_permissions_summary, result[0], result[1]));
R.string.app_permissions_summary, counts[0], counts[1]));
} else {
mAppPermsPreference.setSummary(null);
}