Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f47d4bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into... 

Merge "RemoteInputView: Add null check in WindowInsetsAnimation.Callback" into tm-dev am: c9a1ec32

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17543935



Change-Id: I330210c5241033fd5883627179663821c6c924c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43ce3698 c9a1ec32

packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -269,8 +269,12 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
                super.onEnd(animation);

                super.onEnd(animation);

                if (animation.getTypeMask() == WindowInsets.Type.ime()) {

                if (animation.getTypeMask() == WindowInsets.Type.ime()) {

                    mEntry.mRemoteEditImeAnimatingAway = false;

                    mEntry.mRemoteEditImeAnimatingAway = false;

                    mEntry.mRemoteEditImeVisible =

                    WindowInsets editTextRootWindowInsets = mEditText.getRootWindowInsets();

                            mEditText.getRootWindowInsets().isVisible(WindowInsets.Type.ime());

                    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) {

                    if (!mEntry.mRemoteEditImeVisible && !mEditText.mShowImeOnInputConnection) {

                        mController.removeRemoteInput(mEntry, mToken);

                        mController.removeRemoteInput(mEntry, mToken);

                    }

                    }