diff options
author | Svet Ganov <svetoslavganov@google.com> | 2015-06-11 08:45:28 -0700 |
---|---|---|
committer | Svet Ganov <svetoslavganov@google.com> | 2015-06-11 08:45:34 -0700 |
commit | bd77531b703471c52fe502a43962b31e633e9c7b (patch) | |
tree | 8adbbd1640b71ce37580bebba173773e6edf8796 /src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | |
parent | f101f46723dae43754ddfb0ccf3520de9777c751 (diff) | |
download | android_packages_apps_PackageInstaller-bd77531b703471c52fe502a43962b31e633e9c7b.tar.gz android_packages_apps_PackageInstaller-bd77531b703471c52fe502a43962b31e633e9c7b.tar.bz2 android_packages_apps_PackageInstaller-bd77531b703471c52fe502a43962b31e633e9c7b.zip |
Handle back button in grant permissions activity
bug:21760616
Change-Id: Ie559e5ff3de93c8354e9e1b0a857ccfca228ebc0
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 630335ed..f34e9fd8 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -36,6 +36,7 @@ import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.util.ArrayMap; import android.util.Log; +import android.view.KeyEvent; import android.view.Window; import android.view.WindowManager; @@ -224,6 +225,26 @@ public class GrantPermissionsActivity extends Activity } } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_BACK) { + event.startTracking(); + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_BACK + && event.isTracking() && !event.isCanceled()) { + setResultAndFinish(); + return true; + } + return super.onKeyUp(keyCode, event); + } + private int computePermissionGrantState(PackageInfo callingPackageInfo, String permission, int permissionPolicy) { boolean permissionRequested = false; |