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

Commit cfca598a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes I6bb3f8db,I5b324867 into tm-qpr-dev 

* changes:
  [Chipbar] Create a chipbar-specific logger and make some small updates to logging for both chipbar and temporary display.
  [Chipbar] Remove the media-specific wake reason and window title from the ChipbarCoordinator and instead pass them in each time we display a temporary view.
parents 9365d2b0 4b490fbc

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

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import com.android.systemui.statusbar.policy.dagger.SmartRepliesInflationModule; 
import com.android.systemui.statusbar.policy.dagger.StatusBarPolicyModule;

import com.android.systemui.statusbar.window.StatusBarWindowModule;

import com.android.systemui.telephony.data.repository.TelephonyRepositoryModule;

import com.android.systemui.temporarydisplay.dagger.TemporaryDisplayModule;

import com.android.systemui.tuner.dagger.TunerModule;

import com.android.systemui.unfold.SysUIUnfoldModule;

import com.android.systemui.user.UserModule;
@@ -150,6 +151,7 @@ import dagger.Provides; 
            SysUIConcurrencyModule.class,

            SysUIUnfoldModule.class,

            TelephonyRepositoryModule.class,

            TemporaryDisplayModule.class,

            TunerModule.class,

            UserModule.class,

            UtilModule.class,

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

+5 −4
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ import com.android.systemui.common.shared.model.Icon 
/** Utility methods for media tap-to-transfer. */

class MediaTttUtils {

    companion object {

        // Used in CTS tests UpdateMediaTapToTransferSenderDisplayTest and

        // UpdateMediaTapToTransferReceiverDisplayTest

        const val WINDOW_TITLE = "Media Transfer Chip View"

        const val WAKE_REASON = "MEDIA_TRANSFER_ACTIVATED"

        const val WINDOW_TITLE_SENDER = "Media Transfer Chip View (Sender)"

        const val WINDOW_TITLE_RECEIVER = "Media Transfer Chip View (Receiver)"



        const val WAKE_REASON_SENDER = "MEDIA_TRANSFER_ACTIVATED_SENDER"

        const val WAKE_REASON_RECEIVER = "MEDIA_TRANSFER_ACTIVATED_RECEIVER"



        /**

         * Returns the information needed to display the icon in [Icon] form.

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

+4 −7
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import com.android.systemui.media.taptotransfer.common.MediaTttLogger 
import com.android.systemui.media.taptotransfer.common.MediaTttUtils

import com.android.systemui.statusbar.CommandQueue

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.temporarydisplay.DEFAULT_TIMEOUT_MILLIS

import com.android.systemui.temporarydisplay.TemporaryViewDisplayController

import com.android.systemui.temporarydisplay.TemporaryViewInfo

import com.android.systemui.util.animation.AnimationUtil.Companion.frames
@@ -78,8 +77,6 @@ class MediaTttChipControllerReceiver @Inject constructor( 
        configurationController,

        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 {
@@ -231,7 +228,7 @@ class MediaTttChipControllerReceiver @Inject constructor( 
data class ChipReceiverInfo(

    val routeInfo: MediaRoute2Info,

    val appIconDrawableOverride: Drawable?,

    val appNameOverride: CharSequence?

) : TemporaryViewInfo {

    override fun getTimeoutMs() = DEFAULT_TIMEOUT_MILLIS

}
 
    val appNameOverride: CharSequence?,

    override val windowTitle: String = MediaTttUtils.WINDOW_TITLE_RECEIVER,

    override val wakeReason: String = MediaTttUtils.WAKE_REASON_RECEIVER,

) : TemporaryViewInfo()

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

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ enum class ChipStateSender( 
    @StringRes val stringResId: Int?,

    val transferStatus: TransferStatus,

    val endItem: SenderEndItem?,

    val timeout: Long = DEFAULT_TIMEOUT_MILLIS

    val timeout: Int = DEFAULT_TIMEOUT_MILLIS,

) {

    /**

     * A state representing that the two devices are close but not close enough to *start* a cast to
@@ -223,6 +223,6 @@ sealed class SenderEndItem { 
// Give the Transfer*Triggered states a longer timeout since those states represent an active

// process and we should keep the user informed about it as long as possible (but don't allow it to

// continue indefinitely).

private const val TRANSFER_TRIGGERED_TIMEOUT_MILLIS = 30000L

private const val TRANSFER_TRIGGERED_TIMEOUT_MILLIS = 30000



private const val TAG = "ChipStateSender"

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

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ constructor( 
                    }

                },

            vibrationEffect = chipStateSender.transferStatus.vibrationEffect,

            windowTitle = MediaTttUtils.WINDOW_TITLE_SENDER,

            wakeReason = MediaTttUtils.WAKE_REASON_SENDER,

            timeoutMs = chipStateSender.timeout,

        )

    }