diff options
| author | Jay Thomas Sullivan <jaysullivan@google.com> | 2022-10-11 20:10:45 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-10-11 20:10:45 +0000 |
| commit | 4aba67a8126cf0b26da1578950eec33c57bc08ce (patch) | |
| tree | 713077e10075a8d391641a1dfad1931bc349ef3d | |
| parent | bd6e627517e2a050b4b247ee3f19c3a28fab2e0a (diff) | |
| parent | 3092c0c41dadfd391a126bdbca1a545d7d046ed9 (diff) | |
| download | Permission-4aba67a8126cf0b26da1578950eec33c57bc08ce.tar.gz | |
[automerge] Handle clicking outside of AlertDialog 2p: 3092c0c41d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/20168284
Bug: 244144105
Change-Id: Ieb0e2e8a12eb956374590043fba0a2d4c27ef887
3 files changed, 9 insertions, 0 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java index 8500fadad..ad6b993fa 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/auto/AutoAppPermissionFragment.java @@ -461,6 +461,9 @@ public class AutoAppPermissionFragment extends AutoSettingsFrameFragment AlertDialog.Builder b = new AlertDialog.Builder(getContext()) .setIcon(args.getIconId()) .setMessage(args.getMessageId()) + .setOnCancelListener((DialogInterface dialog) -> { + setRadioButtonsState(mViewModel.getButtonStateLiveData().getValue()); + }) .setNegativeButton(args.getNegativeButtonTextId(), (DialogInterface dialog, int which) -> { setRadioButtonsState(mViewModel.getButtonStateLiveData().getValue()); diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java index dad64abbe..eaa45fc8c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionFragment.java @@ -630,6 +630,9 @@ public class AppPermissionFragment extends SettingsWithLargeHeader AlertDialog.Builder b = new AlertDialog.Builder(getContext()) .setIcon(args.getIconId()) .setMessage(args.getMessageId()) + .setOnCancelListener((DialogInterface dialog) -> { + setRadioButtonsState(mViewModel.getButtonStateLiveData().getValue()); + }) .setNegativeButton(args.getNegativeButtonTextId(), (DialogInterface dialog, int which) -> { setRadioButtonsState(mViewModel.getButtonStateLiveData().getValue()); diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java index 016b7846c..43c59b845 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java @@ -504,6 +504,9 @@ public class AppPermissionFragment extends SettingsWithHeader AlertDialog.Builder b = new AlertDialog.Builder(getContext()) .setIcon(args.getIconId()) .setMessage(args.getMessageId()) + .setOnCancelListener((DialogInterface dialog) -> { + setRadioButtonsState(mViewModel.getButtonStateLiveData().getValue()); + }) .setNegativeButton(args.getNegativeButtonTextId(), (DialogInterface dialog, int which) -> { setRadioButtonsState(mViewModel.getButtonStateLiveData().getValue()); |