Merge changes Idb59c0c2,Idb29d25d,I07f68742 into tm-qpr-dev (a527bb97) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttLogger.kt

+24 −18

Original line number	Diff line number	Diff line
		@@ -18,22 +18,21 @@ package com.android.systemui.media.taptotransfer.common

		import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.LogLevel
		import com.android.systemui.temporarydisplay.TemporaryViewLogger

		/**
		* A logger for media tap-to-transfer events.
		*
		* @property deviceTypeTag the type of device triggering the logs -- "Sender" or "Receiver".
		* @param deviceTypeTag the type of device triggering the logs -- "Sender" or "Receiver".
		*/
		class MediaTttLogger(
		private val deviceTypeTag: String,
		private val buffer: LogBuffer
		){
		private val bufferTag = BASE_TAG + deviceTypeTag

		deviceTypeTag: String,
		buffer: LogBuffer
		) : TemporaryViewLogger(buffer, BASE_TAG + deviceTypeTag) {
		/** Logs a change in the chip state for the given [mediaRouteId]. */
		fun logStateChange(stateName: String, mediaRouteId: String, packageName: String?) {
		buffer.log(
		bufferTag,
		tag,
		LogLevel.DEBUG,
		{
		str1 = stateName
		@@ -44,25 +43,32 @@ class MediaTttLogger(
		)
		}

		/** Logs that we removed the chip for the given [reason]. */
		fun logChipRemoval(reason: String) {
		buffer.log(
		bufferTag,
		LogLevel.DEBUG,
		{ str1 = reason },
		{ "Chip removed due to $str1" }
		)
		}

		/** Logs that we couldn't find information for [packageName]. */
		fun logPackageNotFound(packageName: String) {
		buffer.log(
		bufferTag,
		tag,
		LogLevel.DEBUG,
		{ str1 = packageName },
		{ "Package $str1 could not be found" }
		)
		}

		/**
		* Logs that a removal request has been bypassed (ignored).
		*
		* @param removalReason the reason that the chip removal was requested.
		* @param bypassReason the reason that the request was bypassed.
		*/
		fun logRemovalBypass(removalReason: String, bypassReason: String) {
		buffer.log(
		tag,
		LogLevel.DEBUG,
		{
		str1 = removalReason
		str2 = bypassReason
		},
		{ "Chip removal requested due to $str1; however, removal was ignored because $str2" })
		}
		}

		private const val BASE_TAG = "MediaTtt"

packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttUtils.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ class MediaTttUtils {
		// Used in CTS tests UpdateMediaTapToTransferSenderDisplayTest and
		// UpdateMediaTapToTransferReceiverDisplayTest
		const val WINDOW_TITLE = "Media Transfer Chip View"
		const val WAKE_REASON = "MEDIA_TRANSFER_ACTIVATED"

		/**
		* Returns the information needed to display the icon.

packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ class MediaTttChipControllerReceiver @Inject constructor(
		powerManager: PowerManager,
		@Main private val mainHandler: Handler,
		private val uiEventLogger: MediaTttReceiverUiEventLogger,
		) : TemporaryViewDisplayController<ChipReceiverInfo>(
		) : TemporaryViewDisplayController<ChipReceiverInfo, MediaTttLogger>(
		context,
		logger,
		windowManager,
		@@ -72,6 +72,7 @@ class MediaTttChipControllerReceiver @Inject constructor(
		powerManager,
		R.layout.media_ttt_chip_receiver,
		MediaTttUtils.WINDOW_TITLE,
		MediaTttUtils.WAKE_REASON,
		) {
		@SuppressLint("WrongConstant") // We're allowed to use LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS
		override val windowLayoutParams = commonWindowLayoutParams.apply {

packages/SystemUI/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSender.kt

+6 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ class MediaTttChipControllerSender @Inject constructor(
		configurationController: ConfigurationController,
		powerManager: PowerManager,
		private val uiEventLogger: MediaTttSenderUiEventLogger
		) : TemporaryViewDisplayController<ChipSenderInfo>(
		) : TemporaryViewDisplayController<ChipSenderInfo, MediaTttLogger>(
		context,
		logger,
		windowManager,
		@@ -68,6 +68,7 @@ class MediaTttChipControllerSender @Inject constructor(
		powerManager,
		R.layout.media_ttt_chip,
		MediaTttUtils.WINDOW_TITLE,
		MediaTttUtils.WAKE_REASON,
		) {
		override val windowLayoutParams = commonWindowLayoutParams.apply {
		gravity = Gravity.TOP.or(Gravity.CENTER_HORIZONTAL)
		@@ -105,7 +106,7 @@ class MediaTttChipControllerSender @Inject constructor(
		uiEventLogger.logSenderStateChange(chipState)

		if (chipState == ChipStateSender.FAR_FROM_RECEIVER) {
		removeView(removalReason = ChipStateSender.FAR_FROM_RECEIVER::class.simpleName!!)
		removeView(removalReason = ChipStateSender.FAR_FROM_RECEIVER.name)
		} else {
		displayView(ChipSenderInfo(chipState, routeInfo, undoCallback))
		}
		@@ -179,6 +180,9 @@ class MediaTttChipControllerSender @Inject constructor(
		transferStatus == TransferStatus.SUCCEEDED) &&
		removalReason != TemporaryDisplayRemovalReason.REASON_TIMEOUT
		) {
		logger.logRemovalBypass(
		removalReason, bypassReason = "transferStatus=${transferStatus.name}"
		)
		return
		}
		super.removeView(removalReason)

packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt

+7 −7

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.view.accessibility.AccessibilityManager.FLAG_CONTENT_ICONS
		import android.view.accessibility.AccessibilityManager.FLAG_CONTENT_TEXT
		import androidx.annotation.CallSuper
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.media.taptotransfer.common.MediaTttLogger
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.util.concurrency.DelayableExecutor

		@@ -45,14 +44,14 @@ import com.android.systemui.util.concurrency.DelayableExecutor
		* The generic type T is expected to contain all the information necessary for the subclasses to
		* display the view in a certain state, since they receive <T> in [updateView].
		*
		* TODO(b/245610654): Remove all the media-specific logic from this class.
		*
		* @property windowTitle the title to use for the window that displays the temporary view. Should be
		* normally cased, like "Window Title".
		* @property wakeReason a string used for logging if we needed to wake the screen in order to
		* display the temporary view. Should be screaming snake cased, like WAKE_REASON.
		*/
		abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(
		abstract class TemporaryViewDisplayController<T : TemporaryViewInfo, U : TemporaryViewLogger>(
		internal val context: Context,
		internal val logger: MediaTttLogger,
		internal val logger: U,
		internal val windowManager: WindowManager,
		@Main private val mainExecutor: DelayableExecutor,
		private val accessibilityManager: AccessibilityManager,
		@@ -60,6 +59,7 @@ abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(
		private val powerManager: PowerManager,
		@LayoutRes private val viewLayoutRes: Int,
		private val windowTitle: String,
		private val wakeReason: String,
		) {
		/**
		* Window layout params that will be used as a starting point for the [windowLayoutParams] of
		@@ -114,10 +114,10 @@ abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(
		powerManager.wakeUp(
		SystemClock.uptimeMillis(),
		PowerManager.WAKE_REASON_APPLICATION,
		"com.android.systemui:media_tap_to_transfer_activated"
		"com.android.systemui:$wakeReason",
		)
		}

		logger.logChipAddition()
		inflateAndUpdateView(newInfo)
		}