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

Commit 790175f5 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Tapping a notification closes inline reply, regardless of whether the... 

Merge "Tapping a notification closes inline reply, regardless of whether the user has typed anything." into udc-qpr-dev am: 2cabddb8 am: 9e8079fd

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



Change-Id: Iab46f5d4fa6f43288e47042d98eb5d39c47c462d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 008425e5 9e8079fd

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+1 −2
Original line number Diff line number Diff line
@@ -215,8 +215,7 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
    public void onNotificationClicked(NotificationEntry entry, ExpandableNotificationRow row) {

        mLogger.logStartingActivityFromClick(entry);



        if (mRemoteInputManager.isRemoteInputActive(entry)

                && !TextUtils.isEmpty(row.getActiveRemoteInputText())) {

        if (mRemoteInputManager.isRemoteInputActive(entry)) {

            // We have an active remote input typed and the user clicked on the notification.

            // this was probably unintentional, so we're closing the edit text instead.

            mRemoteInputManager.closeRemoteInputs();