Merge "Hide permission related summaries" into mnc-dev

This commit is contained in:
Jason Monk
2015-05-13 19:22:46 +00:00
committed by Android (Google) Code Review
3 changed files with 6 additions and 6 deletions

View File

@@ -135,8 +135,8 @@ public class AdvancedAppSettings extends SettingsPreferenceFragment implements
public void onPermissionLoadComplete() { public void onPermissionLoadComplete() {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity == null) return; if (activity == null) return;
mAppPermsPreference.setSummary(activity.getString(R.string.app_permissions_summary, // mAppPermsPreference.setSummary(activity.getString(R.string.app_permissions_summary,
mPermissionsInfo.getRuntimePermAppsGrantedCount(), // mPermissionsInfo.getRuntimePermAppsGrantedCount(),
mPermissionsInfo.getRuntimePermAppsCount())); // mPermissionsInfo.getRuntimePermAppsCount()));
} }
} }

View File

@@ -446,7 +446,7 @@ public class InstalledAppDetails extends AppInfoBase
// Update the preference summaries. // Update the preference summaries.
Activity context = getActivity(); Activity context = getActivity();
mStoragePreference.setSummary(AppStorageSettings.getSummary(mAppEntry, context)); mStoragePreference.setSummary(AppStorageSettings.getSummary(mAppEntry, context));
mPermissionsPreference.setSummary(AppPermissionSettings.getSummary(mAppEntry, context)); // mPermissionsPreference.setSummary(AppPermissionSettings.getSummary(mAppEntry, context));
mLaunchPreference.setSummary(Utils.getLaunchByDeafaultSummary(mAppEntry, mUsbManager, mLaunchPreference.setSummary(Utils.getLaunchByDeafaultSummary(mAppEntry, mUsbManager,
mPm, context)); mPm, context));
mNotificationPreference.setSummary(getNotificationSummary(mAppEntry, context, mNotificationPreference.setSummary(getNotificationSummary(mAppEntry, context,

View File

@@ -150,8 +150,8 @@ public class ManagePermissions extends SettingsPreferenceFragment
public void refreshUi() { public void refreshUi() {
setTitle(mGroup.label); setTitle(mGroup.label);
setIcon(mGroup.icon); setIcon(mGroup.icon);
setSummary(getContext().getString(R.string.app_permissions_group_summary, // setSummary(getContext().getString(R.string.app_permissions_group_summary,
mGroup.grantedApps.size(), mGroup.possibleApps.size())); // mGroup.grantedApps.size(), mGroup.possibleApps.size()));
} }
@Override @Override