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

Commit 28cb706e authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev

parents 2db15cdf 190e532c

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

+3 −1
Original line number Diff line number Diff line
@@ -1610,7 +1610,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        }

        Entry entry = mNotificationData.get(key);



        if (entry != null && mRemoteInputController.isRemoteInputActive(entry)) {

        if (entry != null && mRemoteInputController.isRemoteInputActive(entry)

                && (entry.row != null && !entry.row.isDismissed())) {

            mLatestRankingMap = ranking;

            mRemoteInputEntriesToRemoveOnCollapse.add(entry);

            return;
@@ -2535,6 +2536,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                            mStatusBarWindowManager.setHeadsUpShowing(false);

                            mHeadsUpManager.setHeadsUpGoingAway(false);

                        }

                        removeRemoteInputEntriesKeptUntilCollapsed();

                    }

                });

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
    }



    public boolean isActive() {

        return mEditText.isFocused();

        return mEditText.isFocused() && mEditText.isEnabled();

    }



    public void stealFocusFrom(RemoteInputView other) {