Merge "Revert^2 "Clean up PLUG_IN_STATUS_BAR_CHIP flag"" into main (8036b830) · Commits · e / os / android_frameworks_base

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.NotificationLockscreenUserManagerImpl;
		import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.dagger.StartCentralSurfacesModule;
		import com.android.systemui.statusbar.events.StatusBarEventsModule;
		import com.android.systemui.statusbar.phone.DozeServiceHost;
		import com.android.systemui.statusbar.phone.HeadsUpModule;
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
		@@ -99,7 +98,6 @@ import javax.inject.Named;
		ReferenceScreenshotModule.class,
		RotationLockModule.class,
		SceneContainerFrameworkModule.class,
		StatusBarEventsModule.class,
		StartCentralSurfacesModule.class,
		VolumeModule.class,
		WallpaperModule.class,

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ import com.android.systemui.statusbar.NotificationShadeWindowController;
		import com.android.systemui.statusbar.connectivity.ConnectivityModule;
		import com.android.systemui.statusbar.dagger.StatusBarModule;
		import com.android.systemui.statusbar.disableflags.dagger.DisableFlagsModule;
		import com.android.systemui.statusbar.events.StatusBarEventsModule;
		import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;
		import com.android.systemui.statusbar.notification.NotifPipelineFlags;
		import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		@@ -209,6 +210,7 @@ import javax.inject.Named;
		SettingsUtilModule.class,
		SmartRepliesInflationModule.class,
		SmartspaceModule.class,
		StatusBarEventsModule.class,
		StatusBarModule.class,
		StatusBarPipelineModule.class,
		StatusBarPolicyModule.class,

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -409,9 +409,6 @@ object Flags {
		val FILTER_PROVISIONING_NETWORK_SUBSCRIPTIONS =
		releasedFlag("filter_provisioning_network_subscriptions")

		// TODO(b/265892345): Tracking Bug
		val PLUG_IN_STATUS_BAR_CHIP = releasedFlag("plug_in_status_bar_chip")

		// TODO(b/292533677): Tracking Bug
		val WIFI_TRACKER_LIB_FOR_WIFI_ICON = releasedFlag("wifi_tracker_lib_for_wifi_icon")

packages/SystemUI/src/com/android/systemui/statusbar/events/StatusBarEventsModule.kt

+7 −45

Original line number	Diff line number	Diff line
		@@ -17,19 +17,11 @@
		package com.android.systemui.statusbar.events

		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogBufferFactory
		import com.android.systemui.statusbar.window.StatusBarWindowController
		import com.android.systemui.util.concurrency.DelayableExecutor
		import com.android.systemui.util.time.SystemClock
		import dagger.Binds
		import dagger.Module
		import dagger.Provides
		import kotlinx.coroutines.CoroutineScope

		@Module
		interface StatusBarEventsModule {
		@@ -42,41 +34,11 @@ interface StatusBarEventsModule {
		fun provideSystemStatusAnimationSchedulerLogBuffer(factory: LogBufferFactory): LogBuffer {
		return factory.create("SystemStatusAnimationSchedulerLog", 60)
		}
		}

		@Provides
		@Binds
		@SysUISingleton
		fun provideSystemStatusAnimationScheduler(
		featureFlags: FeatureFlags,
		coordinator: SystemEventCoordinator,
		chipAnimationController: SystemEventChipAnimationController,
		statusBarWindowController: StatusBarWindowController,
		dumpManager: DumpManager,
		systemClock: SystemClock,
		@Application coroutineScope: CoroutineScope,
		@Main executor: DelayableExecutor,
		logger: SystemStatusAnimationSchedulerLogger
		): SystemStatusAnimationScheduler {
		return if (featureFlags.isEnabled(Flags.PLUG_IN_STATUS_BAR_CHIP)) {
		SystemStatusAnimationSchedulerImpl(
		coordinator,
		chipAnimationController,
		statusBarWindowController,
		dumpManager,
		systemClock,
		coroutineScope,
		logger
		)
		} else {
		SystemStatusAnimationSchedulerLegacyImpl(
		coordinator,
		chipAnimationController,
		statusBarWindowController,
		dumpManager,
		systemClock,
		executor
		)
		}
		fun bindSystemStatusAnimationScheduler(
		systemStatusAnimationSchedulerImpl: SystemStatusAnimationSchedulerImpl
		): SystemStatusAnimationScheduler
		}
		No newline at end of file
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/events/SystemEventChipAnimationController.kt

+3 −13

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ import androidx.core.animation.AnimatorSet
		import androidx.core.animation.ValueAnimator
		import com.android.internal.annotations.VisibleForTesting
		import com.android.systemui.res.R
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.statusbar.phone.StatusBarContentInsetsChangedListener
		import com.android.systemui.statusbar.phone.StatusBarContentInsetsProvider
		import com.android.systemui.statusbar.window.StatusBarWindowController
		@@ -47,8 +45,7 @@ import kotlin.math.roundToInt
		class SystemEventChipAnimationController @Inject constructor(
		private val context: Context,
		private val statusBarWindowController: StatusBarWindowController,
		private val contentInsetsProvider: StatusBarContentInsetsProvider,
		private val featureFlags: FeatureFlags,
		private val contentInsetsProvider: StatusBarContentInsetsProvider
		) : SystemStatusAnimationCallback {

		private lateinit var animationWindowView: FrameLayout
		@@ -317,15 +314,8 @@ class SystemEventChipAnimationController @Inject constructor(
		it.marginEnd = marginEnd
		}

		private fun initializeAnimRect() = if (featureFlags.isEnabled(Flags.PLUG_IN_STATUS_BAR_CHIP)) {
		animRect.set(chipBounds)
		} else {
		animRect.set(
		chipLeft,
		currentAnimatedView!!.view.top,
		chipRight,
		currentAnimatedView!!.view.bottom)
		}
		private fun initializeAnimRect() = animRect.set(chipBounds)


		/**
		* To be called during an animation, sets the width and updates the current animated chip view