summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-07-14 13:53:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-14 13:53:44 +0000
commita89b4fc76097e2f35e12a469a12c4b5a10348cbb (patch)
tree4615047eafce3e3843375cffe97ab503d914ac90 /src
parenta201ddb05bbded5689722520bdcb015bd3f3ca4a (diff)
parent6d0523c38e5dbb4506bf55051ee10312bcaf88dd (diff)
downloadandroid_packages_apps_PackageInstaller-a89b4fc76097e2f35e12a469a12c4b5a10348cbb.tar.gz
android_packages_apps_PackageInstaller-a89b4fc76097e2f35e12a469a12c4b5a10348cbb.tar.bz2
android_packages_apps_PackageInstaller-a89b4fc76097e2f35e12a469a12c4b5a10348cbb.zip
Merge "Fix back arrow on additional permissions" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index af4992b0..e942ab60 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -383,6 +383,17 @@ public final class AppPermissionsFragment extends SettingsWithHeader
setPreferenceScreen(target.mExtraScreen);
// Copy the header.
setHeader(target.mIcon, target.mLabel, target.mInfoIntent);
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ getFragmentManager().popBackStack();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
}
}
} \ No newline at end of file