Merge "Use correct context, resources and configuration in notification package" into main (898fa852) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/AssistantFeedbackController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import androidx.annotation.Nullable;

		import com.android.internal.R;
		import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Application;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.util.DeviceConfigProxy;
		@@ -72,7 +73,7 @@ public class AssistantFeedbackController {
		/** Injected constructor */
		@Inject
		public AssistantFeedbackController(@Main Handler handler,
		Context context, DeviceConfigProxy proxy) {
		@Application Context context, DeviceConfigProxy proxy) {
		mHandler = handler;
		mContext = context;
		mDeviceConfigProxy = proxy;

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,13 +18,14 @@ package com.android.systemui.statusbar.notification

		import android.content.Context
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.shade.ShadeDisplayAware
		import com.android.systemui.util.Utils
		import javax.inject.Inject

		@SysUISingleton
		class NotificationSectionsFeatureManager
		@Inject
		constructor(val context: Context) {
		constructor(@ShadeDisplayAware val context: Context) {

		fun isMediaControlsEnabled(): Boolean {
		return Utils.useQsMediaPlayer(context)

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt

+14 −12

Original line number	Diff line number	Diff line
		@@ -23,25 +23,27 @@ import android.content.pm.PackageManager
		import android.service.notification.StatusBarNotification
		import android.util.Log
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection
		import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener
		import com.android.systemui.statusbar.phone.CentralSurfaces
		import javax.inject.Inject

		@SysUISingleton
		class TargetSdkResolver @Inject constructor(
		private val context: Context
		) {
		class TargetSdkResolver @Inject constructor(@Application private val context: Context) {
		fun initialize(collection: CommonNotifCollection) {
		collection.addCollectionListener(object : NotifCollectionListener {
		collection.addCollectionListener(
		object : NotifCollectionListener {
		override fun onEntryBind(entry: NotificationEntry, sbn: StatusBarNotification) {
		entry.targetSdk = resolveNotificationSdk(sbn)
		}
		})
		}
		)
		}

		private fun resolveNotificationSdk(sbn: StatusBarNotification): Int {
		val applicationInfo = getApplicationInfoFromExtras(sbn.notification)
		val applicationInfo =
		getApplicationInfoFromExtras(sbn.notification)
		?: getApplicationInfoFromPackageManager(sbn)

		return applicationInfo?.targetSdkVersion ?: 0
		@@ -50,7 +52,7 @@ class TargetSdkResolver @Inject constructor(
		private fun getApplicationInfoFromExtras(notification: Notification): ApplicationInfo? =
		notification.extras.getParcelable(
		Notification.EXTRA_BUILDER_APPLICATION_INFO,
		ApplicationInfo::class.java
		ApplicationInfo::class.java,
		)

		private fun getApplicationInfoFromPackageManager(sbn: StatusBarNotification): ApplicationInfo? {

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -17,8 +17,9 @@
		package com.android.systemui.statusbar.notification.collection.provider

		import android.content.Context
		import com.android.systemui.res.R
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.res.R
		import com.android.systemui.shade.ShadeDisplayAware
		import javax.inject.Inject

		/**
		@@ -31,9 +32,7 @@ import javax.inject.Inject
		* visibility when it invalidates, and we just store that state here.)
		*/
		@SysUISingleton
		class SectionHeaderVisibilityProvider @Inject constructor(
		context: Context
		) {
		class SectionHeaderVisibilityProvider @Inject constructor(@ShadeDisplayAware context: Context) {
		val neverShowSectionHeaders =
		context.resources.getBoolean(R.bool.config_notification_never_show_section_headers)
		var sectionHeadersVisible = true

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt

+12 −8

Original line number	Diff line number	Diff line
		@@ -19,15 +19,16 @@ package com.android.systemui.statusbar.notification.collection.render
		import android.view.LayoutInflater
		import android.view.View
		import android.view.ViewGroup
		import com.android.systemui.res.R
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.res.R
		import com.android.systemui.shade.ShadeDisplayAware
		import com.android.systemui.statusbar.notification.stack.MediaContainerView
		import javax.inject.Inject

		@SysUISingleton
		class MediaContainerController @Inject constructor(
		private val layoutInflater: LayoutInflater
		) : NodeController {
		class MediaContainerController
		@Inject
		constructor(@ShadeDisplayAware private val layoutInflater: LayoutInflater) : NodeController {

		override val nodeLabel = "MediaContainer"
		var mediaContainerView: MediaContainerView? = null
		@@ -42,11 +43,12 @@ class MediaContainerController @Inject constructor(
		parent.removeView(_view)
		}
		}
		val inflated = layoutInflater.inflate(
		val inflated =
		layoutInflater.inflate(
		R.layout.keyguard_media_container,
		parent,
		false /* attachToRoot */)
		as MediaContainerView
		false, /* attachToRoot */
		) as MediaContainerView
		if (oldPos != -1) {
		parent.addView(inflated, oldPos)
		}
		@@ -57,6 +59,8 @@ class MediaContainerController @Inject constructor(
		get() = mediaContainerView!!

		override fun offerToKeepInParentForAnimation(): Boolean = false

		override fun removeFromParentIfKeptForAnimation(): Boolean = false

		override fun resetKeepInParentForAnimation() {}
		}