From f6a05cd23ea6db4e6c546290ba1f91a300a73400 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Mon, 22 Jun 2015 12:15:38 -0400 Subject: Add all permissions screen Bug: 21268041 Change-Id: I51674ffbd252bf4585a992f8cc9e43973ce43512 --- .../permission/ui/AppPermissionsFragment.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java') diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java index 52a2c8e1..93e263be 100644 --- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java @@ -20,6 +20,7 @@ import android.annotation.Nullable; import android.app.ActionBar; import android.app.Activity; import android.app.AlertDialog; +import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; import android.content.DialogInterface; @@ -62,7 +63,9 @@ public final class AppPermissionsFragment extends SettingsWithHeader private static final String LOG_TAG = "ManagePermsFragment"; - private static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton"; + static final String EXTRA_HIDE_INFO_BUTTON = "hideInfoButton"; + + private static final int MENU_ALL_PERMS = 0; private List mToggledGroups; private AppPermissions mAppPermissions; @@ -94,6 +97,10 @@ public final class AppPermissionsFragment extends SettingsWithHeader @Override public void onResume() { super.onResume(); + final ActionBar ab = getActivity().getActionBar(); + if (ab != null) { + ab.setTitle(R.string.app_permissions); + } updateUi(); } @@ -110,6 +117,16 @@ public final class AppPermissionsFragment extends SettingsWithHeader bindPermissionsUi(); return true; } + + case MENU_ALL_PERMS: { + Fragment frag = AllAppPermissionsFragment.newInstance( + getArguments().getString(Intent.EXTRA_PACKAGE_NAME)); + FragmentTransaction ft = getFragmentManager().beginTransaction(); + ft.replace(android.R.id.content, frag); + ft.addToBackStack("AllPerms"); + ft.commit(); + return true; + } } return super.onOptionsItemSelected(item); } @@ -124,6 +141,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.toggle_legacy_permissions, menu); + menu.add(Menu.NONE, MENU_ALL_PERMS, Menu.NONE, R.string.all_permissions); } @Override -- cgit v1.2.3