Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into tm-dev am: c9a1ec32a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17543935 Change-Id: I330210c5241033fd5883627179663821c6c924c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -269,8 +269,12 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
|
||||
super.onEnd(animation);
|
||||
if (animation.getTypeMask() == WindowInsets.Type.ime()) {
|
||||
mEntry.mRemoteEditImeAnimatingAway = false;
|
||||
mEntry.mRemoteEditImeVisible =
|
||||
mEditText.getRootWindowInsets().isVisible(WindowInsets.Type.ime());
|
||||
WindowInsets editTextRootWindowInsets = mEditText.getRootWindowInsets();
|
||||
if (editTextRootWindowInsets == null) {
|
||||
Log.w(TAG, "onEnd called on detached view", new Exception());
|
||||
}
|
||||
mEntry.mRemoteEditImeVisible = editTextRootWindowInsets != null
|
||||
&& editTextRootWindowInsets.isVisible(WindowInsets.Type.ime());
|
||||
if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) {
|
||||
mController.removeRemoteInput(mEntry, mToken);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user