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

Commit aeeaa34a authored by Mady Mellor's avatar Mady Mellor
Browse files

Hide bubble HUNs after unlock with face auth / bypass enabled 

Test: manual - have face auth with bypass enabled
             - get a bubble notification while screen locked
             - look at screen, see HUN, see it unlock
             => bubble with flyout is shown & HUN is hidden
Fixes: 159218197
Change-Id: Ia849b95ecc1c6f08b99c94c0589f151b33bb9ff2
parent 44d6bc85

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

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ public abstract class AlertingNotificationManager implements NotificationLifetim 
         * of the timer and should be removed externally.

         * @return true if the notification is sticky

         */

        protected boolean isSticky() {

        public boolean isSticky() {

            return false;

        }

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

+12 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 




        @Override

        protected boolean isSticky() {

        public boolean isSticky() {

            return super.isSticky() || mMenuShownPinned;

        }
@@ -568,6 +568,17 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
                }

                mKeysToRemoveWhenLeavingKeyguard.clear();

            }

            if (wasKeyguard && !isKeyguard && mBypassController.getBypassEnabled()) {

                ArrayList<String> keysToRemove = new ArrayList<>();

                for (AlertEntry entry : mAlertEntries.values()) {

                    if (entry.mEntry != null && entry.mEntry.isBubble() && !entry.isSticky()) {

                        keysToRemove.add(entry.mEntry.getKey());

                    }

                }

                for (String key : keysToRemove) {

                    removeAlertEntry(key);

                }

            }

        }



        @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ public abstract class HeadsUpManager extends AlertingNotificationManager { 
        protected boolean expanded;



        @Override

        protected boolean isSticky() {

        public boolean isSticky() {

            return (mEntry.isRowPinned() && expanded)

                    || remoteInputActive || hasFullScreenIntent(mEntry);

        }