Merge "Improve the locked-shade close animation after dismissing a single notification" into main (c8ba2fa1) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,16 @@ flag {
		}
		}

		flag {
		name: "notification_shade_close_waits_for_child_animations"
		namespace: "systemui"
		description: "Improve the locked-shade close animation after dismissing a single notification."
		bug: "388298358"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "scene_container"
		namespace: "systemui"

+8 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.view.View;
		import androidx.annotation.NonNull;

		import com.android.internal.statusbar.IStatusBarService;
		import com.android.systemui.Flags;
		import com.android.systemui.InitController;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor;
		@@ -206,9 +207,15 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu
		&& !mQsController.getExpanded()
		&& mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED
		&& !isCollapsing()) {
		if (Flags.notificationShadeCloseWaitsForChildAnimations()) {
		// wait for child animations before we close the shade to have a smooth transition
		mNsslController.runAfterAnimationFinished(
		() -> mStatusBarStateController.setState(StatusBarState.KEYGUARD));
		} else {
		mStatusBarStateController.setState(StatusBarState.KEYGUARD);
		}
		}
		}

		@Override
		public boolean isCollapsing() {