[Chipbar] Move the Media TTT callback listener to a media-specific (9a35f7ec) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+7 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.systemui.log.SessionTracker
		import com.android.systemui.media.RingtonePlayer
		import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper
		import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver
		import com.android.systemui.media.taptotransfer.sender.MediaTttSenderCoordinator
		import com.android.systemui.power.PowerUI
		import com.android.systemui.recents.Recents
		import com.android.systemui.settings.dagger.MultiUserUtilsModule
		@@ -217,6 +218,12 @@ abstract class SystemUICoreStartableModule {
		@ClassKey(KeyguardLiftController::class)
		abstract fun bindKeyguardLiftController(sysui: KeyguardLiftController): CoreStartable

		/** Inject into MediaTttSenderCoordinator. */
		@Binds
		@IntoMap
		@ClassKey(MediaTttSenderCoordinator::class)
		abstract fun bindMediaTttSenderCoordinator(sysui: MediaTttSenderCoordinator): CoreStartable

		/** Inject into MediaTttChipControllerReceiver. */
		@Binds
		@IntoMap

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ import javax.inject.Inject
		* A controller to display and hide the Media Tap-To-Transfer chip on the receiving device.
		*
		* This chip is shown when a user is transferring media to/from a sending device and this device.
		*
		* TODO(b/245610654): Re-name this to be MediaTttReceiverCoordinator.
		*/
		@SysUISingleton
		class MediaTttChipControllerReceiver @Inject constructor(
		@@ -120,7 +122,7 @@ class MediaTttChipControllerReceiver @Inject constructor(
		uiEventLogger.logReceiverStateChange(chipState)

		if (chipState == ChipStateReceiver.FAR_FROM_SENDER) {
		removeView(removalReason = ChipStateReceiver.FAR_FROM_SENDER::class.simpleName!!)
		removeView(removalReason = ChipStateReceiver.FAR_FROM_SENDER.name)
		return
		}
		if (appIcon == null) {

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

0 → 100644

+92 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.media.taptotransfer.sender

		import android.app.StatusBarManager
		import android.content.Context
		import android.media.MediaRoute2Info
		import android.util.Log
		import com.android.internal.statusbar.IUndoMediaTransferCallback
		import com.android.systemui.CoreStartable
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.media.taptotransfer.MediaTttFlags
		import com.android.systemui.media.taptotransfer.common.MediaTttLogger
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.temporarydisplay.chipbar.ChipSenderInfo
		import com.android.systemui.temporarydisplay.chipbar.ChipbarCoordinator
		import com.android.systemui.temporarydisplay.chipbar.SENDER_TAG
		import javax.inject.Inject

		/**
		* A coordinator for showing/hiding the Media Tap-To-Transfer UI on the sending device. This UI
		* is shown when a user is transferring media to/from this device and a receiver device.
		*/
		@SysUISingleton
		class MediaTttSenderCoordinator
		@Inject
		constructor(
		private val chipbarCoordinator: ChipbarCoordinator,
		private val commandQueue: CommandQueue,
		private val context: Context,
		@MediaTttSenderLogger private val logger: MediaTttLogger,
		private val mediaTttFlags: MediaTttFlags,
		private val uiEventLogger: MediaTttSenderUiEventLogger,
		) : CoreStartable {

		private val commandQueueCallbacks =
		object : CommandQueue.Callbacks {
		override fun updateMediaTapToTransferSenderDisplay(
		@StatusBarManager.MediaTransferSenderState displayState: Int,
		routeInfo: MediaRoute2Info,
		undoCallback: IUndoMediaTransferCallback?
		) {
		this@MediaTttSenderCoordinator.updateMediaTapToTransferSenderDisplay(
		displayState,
		routeInfo,
		undoCallback
		)
		}
		}

		override fun start() {
		if (mediaTttFlags.isMediaTttEnabled()) {
		commandQueue.addCallback(commandQueueCallbacks)
		}
		}

		private fun updateMediaTapToTransferSenderDisplay(
		@StatusBarManager.MediaTransferSenderState displayState: Int,
		routeInfo: MediaRoute2Info,
		undoCallback: IUndoMediaTransferCallback?
		) {
		val chipState: ChipStateSender? = ChipStateSender.getSenderStateFromId(displayState)
		val stateName = chipState?.name ?: "Invalid"
		logger.logStateChange(stateName, routeInfo.id, routeInfo.clientPackageName)

		if (chipState == null) {
		Log.e(SENDER_TAG, "Unhandled MediaTransferSenderState $displayState")
		return
		}
		uiEventLogger.logSenderStateChange(chipState)

		if (chipState == ChipStateSender.FAR_FROM_RECEIVER) {
		chipbarCoordinator.removeView(removalReason = ChipStateSender.FAR_FROM_RECEIVER.name)
		} else {
		chipbarCoordinator.displayView(ChipSenderInfo(chipState, routeInfo, undoCallback))
		}
		}
		}

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

+3 −45

Original line number	Diff line number	Diff line
		@@ -16,12 +16,10 @@

		package com.android.systemui.temporarydisplay.chipbar

		import android.app.StatusBarManager
		import android.content.Context
		import android.graphics.Rect
		import android.media.MediaRoute2Info
		import android.os.PowerManager
		import android.util.Log
		import android.view.Gravity
		import android.view.MotionEvent
		import android.view.View
		@@ -38,7 +36,6 @@ import com.android.systemui.animation.ViewHierarchyAnimator
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.media.taptotransfer.MediaTttFlags
		import com.android.systemui.media.taptotransfer.common.MediaTttLogger
		import com.android.systemui.media.taptotransfer.common.MediaTttUtils
		import com.android.systemui.media.taptotransfer.sender.ChipStateSender
		@@ -46,7 +43,6 @@ import com.android.systemui.media.taptotransfer.sender.MediaTttSenderLogger
		import com.android.systemui.media.taptotransfer.sender.MediaTttSenderUiEventLogger
		import com.android.systemui.media.taptotransfer.sender.TransferStatus
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.temporarydisplay.TemporaryDisplayRemovalReason
		import com.android.systemui.temporarydisplay.TemporaryViewDisplayController
		@@ -76,7 +72,6 @@ import javax.inject.Inject
		*/
		@SysUISingleton
		open class ChipbarCoordinator @Inject constructor(
		private val commandQueue: CommandQueue,
		context: Context,
		@MediaTttSenderLogger logger: MediaTttLogger,
		windowManager: WindowManager,
		@@ -87,7 +82,6 @@ open class ChipbarCoordinator @Inject constructor(
		private val uiEventLogger: MediaTttSenderUiEventLogger,
		private val falsingManager: FalsingManager,
		private val falsingCollector: FalsingCollector,
		private val mediaTttFlags: MediaTttFlags,
		private val viewUtil: ViewUtil,
		) : TemporaryViewDisplayController<ChipSenderInfo, MediaTttLogger>(
		context,
		@@ -108,50 +102,14 @@ open class ChipbarCoordinator @Inject constructor(
		gravity = Gravity.TOP.or(Gravity.CENTER_HORIZONTAL)
		}

		private val commandQueueCallbacks = object : CommandQueue.Callbacks {
		override fun updateMediaTapToTransferSenderDisplay(
		@StatusBarManager.MediaTransferSenderState displayState: Int,
		routeInfo: MediaRoute2Info,
		undoCallback: IUndoMediaTransferCallback?
		) {
		this@ChipbarCoordinator.updateMediaTapToTransferSenderDisplay(
		displayState, routeInfo, undoCallback
		)
		}
		}

		private fun updateMediaTapToTransferSenderDisplay(
		@StatusBarManager.MediaTransferSenderState displayState: Int,
		routeInfo: MediaRoute2Info,
		undoCallback: IUndoMediaTransferCallback?
		) {
		val chipState: ChipStateSender? = ChipStateSender.getSenderStateFromId(displayState)
		val stateName = chipState?.name ?: "Invalid"
		logger.logStateChange(stateName, routeInfo.id, routeInfo.clientPackageName)

		if (chipState == null) {
		Log.e(SENDER_TAG, "Unhandled MediaTransferSenderState $displayState")
		return
		}
		uiEventLogger.logSenderStateChange(chipState)

		if (chipState == ChipStateSender.FAR_FROM_RECEIVER) {
		removeView(removalReason = ChipStateSender.FAR_FROM_RECEIVER.name)
		} else {
		displayView(ChipSenderInfo(chipState, routeInfo, undoCallback))
		}
		}

		override fun start() {
		if (mediaTttFlags.isMediaTttEnabled()) {
		commandQueue.addCallback(commandQueueCallbacks)
		}
		}
		override fun start() {}

		override fun updateView(
		newInfo: ChipSenderInfo,
		currentView: ViewGroup
		) {
		// TODO(b/245610654): Adding logging here.

		val chipState = newInfo.state

		// Detect falsing touches on the chip.

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

0 → 100644

+442 −0

File added.

Preview size limit exceeded, changes collapsed.