Merge "Add additional permissions button to manage perms" into mnc-dev

This commit is contained in:
Jason Monk
2015-05-13 18:40:49 +00:00
committed by Android (Google) Code Review
3 changed files with 109 additions and 11 deletions

View File

@@ -15,16 +15,22 @@
*/
package com.android.settings.applications;
import android.app.Activity;
import android.app.FragmentTransaction;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceScreen;
import android.util.Log;
import android.view.View;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.AppHeader;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settingslib.applications.PermissionsInfo;
@@ -33,12 +39,16 @@ import com.android.settingslib.applications.PermissionsInfo.PermissionGroup;
import java.util.List;
public class ManagePermissions extends SettingsPreferenceFragment
implements PermissionsInfo.Callback, OnPreferenceClickListener {
implements PermissionsInfo.Callback {
private static final String TAG = "ManagePermissions";
private static final String OS_PKG = "android";
private PermissionsInfo mPermissionsInfo;
private PreferenceScreen mExtraScreen;
@Override
public void onResume() {
super.onResume();
@@ -54,25 +64,66 @@ public class ManagePermissions extends SettingsPreferenceFragment
}
private void refreshUi() {
Activity activity = getActivity();
PreferenceScreen screen = getPreferenceScreen();
if (screen == null) {
screen = getPreferenceManager().createPreferenceScreen(getActivity());
screen = getPreferenceManager().createPreferenceScreen(activity);
setPreferenceScreen(screen);
} else {
screen.removeAll();
if (mExtraScreen != null) {
mExtraScreen.removeAll();
}
}
final int count = screen.getPreferenceCount();
if (count == 0) {
final Preference extraScreenPreference = new Preference(activity);
extraScreenPreference.setIcon(R.drawable.ic_toc);
extraScreenPreference.setTitle(R.string.additional_permissions);
List<PermissionGroup> groups = mPermissionsInfo.getGroups();
for (PermissionGroup group : groups) {
if (group.possibleApps.size() == 0) continue;
PermissionPreference pref = new PermissionPreference(getActivity(), group);
PermissionPreference pref = new PermissionPreference(activity, group);
pref.refreshUi();
screen.addPreference(pref);
if (group.packageName.equals(OS_PKG)) {
screen.addPreference(pref);
} else {
if (mExtraScreen == null) {
mExtraScreen = getPreferenceManager().createPreferenceScreen(activity);
}
mExtraScreen.addPreference(pref);
}
}
if (mExtraScreen != null) {
extraScreenPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
AdditionalPermissionsFragment frag = new AdditionalPermissionsFragment();
frag.setTargetFragment(ManagePermissions.this, 0);
FragmentTransaction ft = getFragmentManager().beginTransaction();
ft.replace(R.id.main_content, frag);
ft.addToBackStack("AdditionalPerms");
ft.commit();
return true;
}
});
extraScreenPreference.setSummary(getString(R.string.additional_permissions_more,
mExtraScreen.getPreferenceCount()));
screen.addPreference(extraScreenPreference);
}
} else {
for (int i = 0; i < count; i++) {
((PermissionPreference) screen.getPreference(i)).refreshUi();
updatePrefs(screen);
if (mExtraScreen != null) {
updatePrefs(mExtraScreen);
}
}
}
private void updatePrefs(PreferenceScreen screen) {
for (int i = 0; i < screen.getPreferenceCount(); i++) {
Preference pref = screen.getPreference(i);
if (pref instanceof PermissionPreference) {
((PermissionPreference) pref).refreshUi();
}
}
}
@@ -82,11 +133,6 @@ public class ManagePermissions extends SettingsPreferenceFragment
refreshUi();
}
@Override
public boolean onPreferenceClick(Preference preference) {
return true;
}
@Override
protected int getMetricsCategory() {
return MetricsLogger.MANAGE_PERMISSIONS;
@@ -121,4 +167,26 @@ public class ManagePermissions extends SettingsPreferenceFragment
}
}
public static class AdditionalPermissionsFragment extends SettingsPreferenceFragment {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setPreferenceScreen(((ManagePermissions) getTargetFragment()).mExtraScreen);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
Resources resources = getResources();
Theme theme = getActivity().getTheme();
AppHeader.createAppHeader(this, resources.getDrawable(R.drawable.ic_toc, theme),
getString(R.string.additional_permissions), null, android.R.color.white);
}
@Override
protected int getMetricsCategory() {
return MetricsLogger.MANAGE_PERMISSIONS;
}
}
}