Merge "Don't pin notifications when the shade is expanded" into main (dde51111) · Commits · e / os / android_frameworks_base

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.logging.UiEventLogger;
		import com.android.internal.policy.SystemBarUtils;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;
		@@ -172,11 +171,9 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements
		updateResources();
		}
		});
		if (!NotificationsHeadsUpRefactor.isEnabled()) {
		javaAdapter.alwaysCollectFlow(shadeInteractor.isAnyExpanded(),
		this::onShadeOrQsExpanded);
		}
		}

		public void setAnimationStateHandler(AnimationStateHandler handler) {
		mAnimationStateHandler = handler;
		@@ -270,10 +267,9 @@ public class HeadsUpManagerPhone extends BaseHeadsUpManager implements
		}

		private void onShadeOrQsExpanded(Boolean isExpanded) {
		NotificationsHeadsUpRefactor.assertInLegacyMode();
		if (isExpanded != mIsExpanded) {
		mIsExpanded = isExpanded;
		if (isExpanded) {
		if (!NotificationsHeadsUpRefactor.isEnabled() && isExpanded) {
		mHeadsUpAnimatingAway.setValue(false);
		}
		}