Merge "Revert hide logic in ImeInsetsSourceConsumer#setControl" into sc-v2-dev

This commit is contained in:
Ming-Shin Lu
2021-11-25 02:30:29 +00:00
committed by Android (Google) Code Review

View File

@@ -124,7 +124,12 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer {
public void setControl(@Nullable InsetsSourceControl control, int[] showTypes,
int[] hideTypes) {
super.setControl(control, showTypes, hideTypes);
if (control == null && !isRequestedVisibleAwaitingControl()) {
// TODO(b/204524304): clean-up how to deal with the timing issues of hiding IME:
// 1) Already requested show IME, in the meantime of WM callback the control but got null
// control when relayout comes first
// 2) Make sure no regression on some implicit request IME visibility calls (e.g.
// toggleSoftInput)
if (control == null && !mIsRequestedVisibleAwaitingControl) {
hide();
removeSurface();
}