Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16ba004f authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add UiEventLogger to TemporaryView"" into udc-dev am: f05dac69 am: 924f4064 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23339140



Change-Id: Iea0cb8cb746e65b2b55dc29056fbaa4ce92f7bc5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33399e83 924f4064

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

+1 −20
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.view.View.ACCESSIBILITY_LIVE_REGION_NONE 
import com.android.internal.widget.CachingIconView

import com.android.systemui.R

import com.android.app.animation.Interpolators

import com.android.internal.logging.InstanceId

import com.android.systemui.common.shared.model.ContentDescription

import com.android.systemui.common.ui.binder.TintedIconViewBinder

import com.android.systemui.dagger.SysUISingleton
@@ -50,7 +49,6 @@ import com.android.systemui.statusbar.CommandQueue 
import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.temporarydisplay.TemporaryViewDisplayController

import com.android.systemui.temporarydisplay.TemporaryViewInfo

import com.android.systemui.temporarydisplay.TemporaryViewUiEventLogger

import com.android.systemui.temporarydisplay.ViewPriority

import com.android.systemui.util.animation.AnimationUtil.Companion.frames

import com.android.systemui.util.concurrency.DelayableExecutor
@@ -84,7 +82,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        wakeLockBuilder: WakeLock.Builder,

        systemClock: SystemClock,

        private val rippleController: MediaTttReceiverRippleController,

        private val temporaryViewUiEventLogger: TemporaryViewUiEventLogger,

) : TemporaryViewDisplayController<ChipReceiverInfo, MediaTttReceiverLogger>(

        context,

        logger,
@@ -97,7 +94,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        R.layout.media_ttt_chip_receiver,

        wakeLockBuilder,

        systemClock,

        temporaryViewUiEventLogger,

) {

    @SuppressLint("WrongConstant") // We're allowed to use LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS

    override val windowLayoutParams = commonWindowLayoutParams.apply {
@@ -129,11 +125,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        }

    }



    // A map to store instance id per route info id.

    private var instanceMap: MutableMap<String, InstanceId> = mutableMapOf()



    private val displayListener = Listener { id, _ -> instanceMap.remove(id) }



    private fun updateMediaTapToTransferReceiverDisplay(

        @StatusBarManager.MediaTransferReceiverState displayState: Int,

        routeInfo: MediaRoute2Info,
@@ -148,18 +139,12 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
            logger.logStateChangeError(displayState)

            return

        }



        val instanceId: InstanceId = instanceMap[routeInfo.id]

                ?: temporaryViewUiEventLogger.getNewInstanceId()

        uiEventLogger.logReceiverStateChange(chipState, instanceId)

        uiEventLogger.logReceiverStateChange(chipState)



        if (chipState != ChipStateReceiver.CLOSE_TO_SENDER) {

            removeView(routeInfo.id, removalReason = chipState.name)

            return

        }



        // Save instance id to use for logging view events.

        instanceMap[routeInfo.id] = instanceId

        if (appIcon == null) {

            displayView(

                ChipReceiverInfo(
@@ -167,7 +152,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
                    appIconDrawableOverride = null,

                    appName,

                    id = routeInfo.id,

                    instanceId = instanceId,

                )

            )

            return
@@ -182,7 +166,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
                            drawable,

                            appName,

                            id = routeInfo.id,

                            instanceId = instanceId,

                        )

                    )

                },
@@ -197,7 +180,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        if (mediaTttFlags.isMediaTttEnabled()) {

            commandQueue.addCallback(commandQueueCallbacks)

        }

        registerListener(displayListener)

    }



    override fun updateView(newInfo: ChipReceiverInfo, currentView: ViewGroup) {
@@ -360,5 +342,4 @@ data class ChipReceiverInfo( 
    override val wakeReason: String = MediaTttUtils.WAKE_REASON_RECEIVER,

    override val id: String,

    override val priority: ViewPriority = ViewPriority.NORMAL,

    override val instanceId: InstanceId,

) : TemporaryViewInfo()

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

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.media.taptotransfer.receiver



import com.android.internal.logging.InstanceId

import com.android.internal.logging.UiEvent

import com.android.internal.logging.UiEventLogger

import com.android.systemui.dagger.SysUISingleton
@@ -26,8 +25,8 @@ import javax.inject.Inject 
@SysUISingleton

class MediaTttReceiverUiEventLogger @Inject constructor(private val logger: UiEventLogger) {

    /** Logs that the receiver chip has changed states. */

    fun logReceiverStateChange(chipState: ChipStateReceiver, instanceId: InstanceId) {

        logger.log(chipState.uiEvent, instanceId)

    fun logReceiverStateChange(chipState: ChipStateReceiver) {

        logger.log(chipState.uiEvent)

    }

}

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

+6 −15
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.StatusBarManager 
import android.content.Context

import android.media.MediaRoute2Info

import android.view.View

import com.android.internal.logging.InstanceId

import com.android.internal.logging.UiEventLogger

import com.android.internal.statusbar.IUndoMediaTransferCallback

import com.android.systemui.CoreStartable
@@ -60,8 +59,8 @@ constructor( 
    // Since the media transfer display is similar to a heads-up notification, use the same timeout.

    private val defaultTimeout = context.resources.getInteger(R.integer.heads_up_notification_decay)



    // A map to store instance id and current chip state per id.

    private var stateMap: MutableMap<String, Pair<InstanceId, ChipStateSender>> = mutableMapOf()

    // A map to store current chip state per id.

    private var stateMap: MutableMap<String, ChipStateSender> = mutableMapOf()



    private val commandQueueCallbacks =

        object : CommandQueue.Callbacks {
@@ -99,10 +98,7 @@ constructor( 
            return

        }



        val currentStateForId: ChipStateSender? = stateMap[routeInfo.id]?.second

        val instanceId: InstanceId =

            stateMap[routeInfo.id]?.first

                ?: chipbarCoordinator.tempViewUiEventLogger.getNewInstanceId()

        val currentStateForId: ChipStateSender? = stateMap[routeInfo.id]

        if (!ChipStateSender.isValidStateTransition(currentStateForId, chipState)) {

            // ChipStateSender.FAR_FROM_RECEIVER is the default state when there is no state.

            logger.logInvalidStateTransitionError(
@@ -111,7 +107,7 @@ constructor( 
            )

            return

        }

        uiEventLogger.logSenderStateChange(chipState, instanceId)

        uiEventLogger.logSenderStateChange(chipState)



        if (chipState == ChipStateSender.FAR_FROM_RECEIVER) {

            // Return early if we're not displaying a chip for this ID anyway
@@ -135,7 +131,7 @@ constructor( 
            removeIdFromStore(routeInfo.id, reason = removalReason)

            chipbarCoordinator.removeView(routeInfo.id, removalReason)

        } else {

            stateMap[routeInfo.id] = Pair(instanceId, chipState)

            stateMap[routeInfo.id] = chipState

            logger.logStateMap(stateMap)

            chipbarCoordinator.registerListener(displayListener)

            chipbarCoordinator.displayView(
@@ -145,7 +141,6 @@ constructor( 
                    undoCallback,

                    context,

                    logger,

                    instanceId,

                )

            )

        }
@@ -160,7 +155,6 @@ constructor( 
        undoCallback: IUndoMediaTransferCallback?,

        context: Context,

        logger: MediaTttSenderLogger,

        instanceId: InstanceId,

    ): ChipbarInfo {

        val packageName = routeInfo.clientPackageName

        val otherDeviceName =
@@ -196,7 +190,6 @@ constructor( 
                                chipStateSender.endItem.uiEventOnClick,

                                chipStateSender.endItem.newState,

                                routeInfo,

                                instanceId,

                            )

                        } else {

                            null
@@ -210,7 +203,6 @@ constructor( 
            timeoutMs = timeout,

            id = routeInfo.id,

            priority = ViewPriority.NORMAL,

            instanceId = instanceId,

        )

    }
@@ -225,11 +217,10 @@ constructor( 
        uiEvent: UiEventLogger.UiEventEnum,

        @StatusBarManager.MediaTransferSenderState newState: Int,

        routeInfo: MediaRoute2Info,

        instanceId: InstanceId,

    ): ChipbarEndItem.Button {

        val onClickListener =

            View.OnClickListener {

                uiEventLogger.logUndoClicked(uiEvent, instanceId)

                uiEventLogger.logUndoClicked(uiEvent)

                undoCallback.onUndoTriggered()



                // The external service should eventually send us a new TransferTriggered state, but

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

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.media.taptotransfer.sender



import android.app.StatusBarManager

import com.android.internal.logging.InstanceId

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.log.LogBuffer

import com.android.systemui.log.LogLevel
@@ -87,7 +86,7 @@ constructor( 
    }



    /** Logs the current contents of the state map. */

    fun logStateMap(map: Map<String, Pair<InstanceId, ChipStateSender>>) {

    fun logStateMap(map: Map<String, ChipStateSender>) {

        buffer.log(

            TAG,

            LogLevel.DEBUG,

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

+6 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.media.taptotransfer.sender



import android.util.Log

import com.android.internal.logging.InstanceId

import com.android.internal.logging.UiEvent

import com.android.internal.logging.UiEventLogger

import com.android.systemui.dagger.SysUISingleton
@@ -27,8 +26,8 @@ import javax.inject.Inject 
@SysUISingleton

class MediaTttSenderUiEventLogger @Inject constructor(private val logger: UiEventLogger) {

    /** Logs that the sender chip has changed states. */

    fun logSenderStateChange(chipState: ChipStateSender, instanceId: InstanceId) {

        logger.log(chipState.uiEvent, instanceId)

    fun logSenderStateChange(chipState: ChipStateSender) {

        logger.log(chipState.uiEvent)

    }



    /**
@@ -36,11 +35,10 @@ class MediaTttSenderUiEventLogger @Inject constructor(private val logger: UiEven 
     *

     * @param undoUiEvent the uiEvent specific to which undo button was clicked.

     */

    fun logUndoClicked(undoUiEvent: UiEventLogger.UiEventEnum, instanceId: InstanceId) {

    fun logUndoClicked(undoUiEvent: UiEventLogger.UiEventEnum) {

        val isUndoEvent =

            undoUiEvent ==

                    MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_RECEIVER_CLICKED ||

                    undoUiEvent ==

            undoUiEvent == MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_RECEIVER_CLICKED

                    || undoUiEvent ==

                    MediaTttSenderUiEvents.MEDIA_TTT_SENDER_UNDO_TRANSFER_TO_THIS_DEVICE_CLICKED

        if (!isUndoEvent) {

            Log.w(
@@ -49,7 +47,7 @@ class MediaTttSenderUiEventLogger @Inject constructor(private val logger: UiEven 
            )

            return

        }

        logger.log(undoUiEvent, instanceId)

        logger.log(undoUiEvent)

    }

}