diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-19 14:37:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-04-19 14:37:09 +0000 |
| commit | f5925bd7fcd7627d592a54f34db2b4bd47884b9e (patch) | |
| tree | 11dcc110730f51460da4f917396137e6673ef948 /core/java/android/inputmethodservice/InputMethodService.java | |
| parent | 0dd99e0c3c6f766adb0d8849499b1e3dabc097c1 (diff) | |
| parent | c66dd0af0250a3923904bf8d3c9c9474023a15b1 (diff) | |
Merge "Fix not invoke setImeWindowStatus when unlocked by PIN lock" into sc-dev
Diffstat (limited to 'core/java/android/inputmethodservice/InputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/InputMethodService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java index f03da7cd390b..4b8e37c56061 100644 --- a/core/java/android/inputmethodservice/InputMethodService.java +++ b/core/java/android/inputmethodservice/InputMethodService.java @@ -819,10 +819,9 @@ public class InputMethodService extends AbstractInputMethodService { if (dispatchOnShowInputRequested(flags, false)) { showWindow(true); applyVisibilityInInsetsConsumerIfNecessary(true /* setVisible */); - } else { - // If user uses hard keyboard, IME button should always be shown. - setImeWindowStatus(mapToImeWindowStatus(), mBackDisposition); } + setImeWindowStatus(mapToImeWindowStatus(), mBackDisposition); + final boolean isVisible = isInputViewShown(); final boolean visibilityChanged = isVisible != wasVisible; if (resultReceiver != null) { |