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

Commit 2838d83f authored by Wilson Wu's avatar Wilson Wu Committed by Automerger Merge Worker
Browse files

Merge "Fix keyboard remain after dismissing notification" into sc-dev am: f18be559 

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

Change-Id: I27f33c549daff06c5e12220c870de5d7d677487d
parents 912800b2 f18be559

packages/SystemUI/src/com/android/systemui/statusbar/NotificationRemoteInputManager.java

+1 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ public class NotificationRemoteInputManager implements Dumpable { 
            mKeysKeptForRemoteInputHistory.remove(key);

        }

        if (mRemoteInputController.isRemoteInputActive(entry)) {

            entry.mRemoteEditImeVisible = false;

            mRemoteInputController.removeRemoteInput(entry, null);

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationRemoteInputManagerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class NotificationRemoteInputManagerTest extends SysuiTestCase { 
        when(mController.isRemoteInputActive(mEntry)).thenReturn(true);

        mRemoteInputManager.onPerformRemoveNotification(mEntry, mEntry.getKey());



        assertFalse(mEntry.mRemoteEditImeVisible);

        verify(mController).removeRemoteInput(mEntry, null);

    }