diff options
| author | Nate Myren <ntmyren@google.com> | 2023-08-31 15:29:37 -0700 |
|---|---|---|
| committer | Nate Myren <ntmyren@google.com> | 2023-08-31 22:34:13 +0000 |
| commit | 1fcd92de12cf42026c66b12a1d8e35e50faf1660 (patch) | |
| tree | 236b93d96be849d9ae8bf8abaf484a95a18f8d4a /PermissionController | |
| parent | 67ff062d52530beb1e471d1d4f438e7cf0da2dfa (diff) | |
| download | Permission-1fcd92de12cf42026c66b12a1d8e35e50faf1660.tar.gz | |
Only dismiss keyboard when showing system-triggered dialogs
Non-system triggered dialogs can be assumed to be displaying properly
with the keyboard (since the app is aware of the dialog)
Bug: 297822681
Test: manual
Relnote: Fixed the Permission Grant dialog dismissing keyboards unnecessarily
Change-Id: I3b475401dde1a9e61e5b62c0f254b9e513df341f
Diffstat (limited to 'PermissionController')
| -rw-r--r-- | PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java index c173146eb..a6e521138 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java @@ -546,8 +546,11 @@ public class GrantPermissionsActivity extends SettingsActivity getWindow().setDimAmount(mOriginalDimAmount); if (mRootView.getVisibility() == View.GONE) { - InputMethodManager manager = getSystemService(InputMethodManager.class); - manager.hideSoftInputFromWindow(mRootView.getWindowToken(), 0); + if (mIsSystemTriggered) { + // We don't want the keyboard obscuring system-triggered dialogs + InputMethodManager manager = getSystemService(InputMethodManager.class); + manager.hideSoftInputFromWindow(mRootView.getWindowToken(), 0); + } mRootView.setVisibility(View.VISIBLE); } } |