Merge "Hide bubble HUNs after unlock with face auth / bypass enabled" into rvc-dev (d51f4018) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -316,7 +316,7 @@ public abstract class AlertingNotificationManager implements NotificationLifetim
	* of the timer and should be removed externally.		* of the timer and should be removed externally.
	* @return true if the notification is sticky		* @return true if the notification is sticky
	*/		*/
	protected boolean isSticky() {		public boolean isSticky() {
	return false;		return false;
	}		}

+12 −1

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


	@Override		@Override
	protected boolean isSticky() {		public boolean isSticky() {
	return super.isSticky() \|\| mMenuShownPinned;		return super.isSticky() \|\| mMenuShownPinned;
	}		}

	@@ -568,6 +568,17 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable,
	}		}
	mKeysToRemoveWhenLeavingKeyguard.clear();		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		@Override

+1 −1

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

	@Override		@Override
	protected boolean isSticky() {		public boolean isSticky() {
	return (mEntry.isRowPinned() && expanded)		return (mEntry.isRowPinned() && expanded)
	\|\| remoteInputActive \|\| hasFullScreenIntent(mEntry);		\|\| remoteInputActive \|\| hasFullScreenIntent(mEntry);
	}		}