Merge "Remove flag NOTIFICATION_SHELF_REFACTOR" into main (f6e3f562) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,6 @@ import com.android.systemui.statusbar.notification.interruption.VisualInterrupti
		import com.android.systemui.statusbar.notification.people.PeopleHubModule;
		import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent;
		import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent;
		import com.android.systemui.statusbar.notification.row.dagger.NotificationShelfComponent;
		import com.android.systemui.statusbar.phone.CentralSurfaces;
		import com.android.systemui.statusbar.phone.LetterboxModule;
		import com.android.systemui.statusbar.phone.NotificationIconAreaControllerModule;
		@@ -232,7 +231,6 @@ import javax.inject.Named;
		KeyguardBouncerComponent.class,
		NavigationBarComponent.class,
		NotificationRowComponent.class,
		NotificationShelfComponent.class,
		WindowRootViewComponent.class,
		})
		public abstract class SystemUIModule {

packages/SystemUI/src/com/android/systemui/flags/FlagDependencies.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha
		FlagDependenciesBase(featureFlags, handler) {
		override fun defineDependencies() {
		FooterViewRefactor.token dependsOn NotificationIconContainerRefactor.token
		NotificationIconContainerRefactor.token dependsOn Classic.NOTIFICATION_SHELF_REFACTOR

		// These two flags are effectively linked. We should migrate them to a single aconfig flag.
		Classic.MIGRATE_NSSL dependsOn Classic.MIGRATE_KEYGUARD_STATUS_VIEW

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -83,10 +83,6 @@ object Flags {
		@JvmField
		val NOTIFICATION_INLINE_REPLY_ANIMATION = releasedFlag("notification_inline_reply_animation")

		// TODO(b/277338665): Tracking Bug
		@JvmField
		val NOTIFICATION_SHELF_REFACTOR = releasedFlag("notification_shelf_refactor")

		// TODO(b/288326013): Tracking Bug
		@JvmField
		val NOTIFICATION_ASYNC_HYBRID_VIEW_INFLATION =

packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ constructor(
		Flags.MIGRATE_LOCK_ICON,
		Flags.MIGRATE_NSSL,
		Flags.MIGRATE_KEYGUARD_STATUS_VIEW,
		Flags.NOTIFICATION_SHELF_REFACTOR,
		Flags.MIGRATE_KEYGUARD_STATUS_BAR_VIEW,
		)
		}

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+1 −14

Original line number	Diff line number	Diff line
		@@ -173,7 +173,6 @@ import com.android.systemui.statusbar.KeyguardIndicationController;
		import com.android.systemui.statusbar.LockscreenShadeTransitionController;
		import com.android.systemui.statusbar.NotificationShadeDepthController;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.NotificationShelfController;
		import com.android.systemui.statusbar.PulseExpansionHandler;
		import com.android.systemui.statusbar.StatusBarState;
		import com.android.systemui.statusbar.SysuiStatusBarStateController;
		@@ -520,7 +519,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		/** Are we currently in gesture navigation. */
		private boolean mIsGestureNavigation;
		private int mOldLayoutDirection;
		private NotificationShelfController mNotificationShelfController;

		private final ContentResolver mContentResolver;
		private float mMinFraction;
		@@ -1886,11 +1884,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		}

		private int getShelfHeight() {
		if (mFeatureFlags.isEnabled(Flags.NOTIFICATION_SHELF_REFACTOR)) {
		return mNotificationStackScrollLayoutController.getShelfHeight();
		} else {
		return mNotificationShelfController.getIntrinsicHeight();
		}
		}

		private void updateClock() {
		@@ -3498,7 +3492,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		CentralSurfaces centralSurfaces,
		GestureRecorder recorder,
		Runnable hideExpandedRunnable,
		NotificationShelfController notificationShelfController,
		HeadsUpManager headsUpManager) {
		setHeadsUpManager(headsUpManager);
		// TODO(b/254859580): this can be injected.
		@@ -3506,12 +3499,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump

		mGestureRecorder = recorder;
		mHideExpandedRunnable = hideExpandedRunnable;
		mNotificationShelfController = notificationShelfController;
		if (!mFeatureFlags.isEnabled(Flags.NOTIFICATION_SHELF_REFACTOR)) {
		mNotificationStackScrollLayoutController.setShelfController(
		notificationShelfController);
		mLockscreenShadeTransitionController.bindController(notificationShelfController);
		}
		updateMaxDisplayedNotifications(true);
		}