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

Commit 93516743 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Chipbar] Move the controller that was common between the media ttt 

sender and media ttt receiver into a more generic
TemporaryViewDisplayController class.

Future CLs will pull all the media-specific code out of this generic
class.

Bug: 245610654
Test: media.taptotransfer tests
Test: temporarydisplay tests
Test: verify media ttt chip still works
Change-Id: I814c04068fbd2b02521dd9bf8b2794bb0273464b
parent 40db12e7

packages/SystemUI/ktfmt_includes.txt

+3 −3
Original line number Diff line number Diff line
@@ -240,8 +240,6 @@ 
-packages/SystemUI/src/com/android/systemui/media/nearby/NearbyMediaDevicesManager.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelper.kt

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/MediaTttFlags.kt

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

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

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

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

-packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt
@@ -529,6 +527,8 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/tv/VpnStatusObserver.kt

-packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowModule.kt

-packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewInfo.kt

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

-packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt

-packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt

-packages/SystemUI/src/com/android/systemui/tv/TVSystemUICoreStartableModule.kt
@@ -677,7 +677,6 @@ 
-packages/SystemUI/tests/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/nearby/NearbyMediaDevicesManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommonTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/common/MediaTttLoggerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttChipControllerSenderTest.kt
@@ -834,6 +833,7 @@ 
-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/VariableDateViewControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/WalletControllerImplTest.kt

-packages/SystemUI/tests/src/com/android/systemui/statusbar/window/StatusBarWindowStateControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/unfold/FoldStateLoggingProviderTest.kt

-packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldTransitionWallpaperControllerTest.kt

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

+5 −8
Original line number Diff line number Diff line
@@ -34,15 +34,14 @@ import com.android.settingslib.Utils 
import com.android.systemui.R

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.media.taptotransfer.common.ChipInfoCommon

import com.android.systemui.media.taptotransfer.common.DEFAULT_TIMEOUT_MILLIS

import com.android.systemui.media.taptotransfer.common.MediaTttChipControllerCommon

import com.android.systemui.media.taptotransfer.common.MediaTttLogger

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

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.view.ViewUtil

import javax.inject.Inject



/**
@@ -56,18 +55,16 @@ class MediaTttChipControllerReceiver @Inject constructor( 
        context: Context,

        @MediaTttReceiverLogger logger: MediaTttLogger,

        windowManager: WindowManager,

        viewUtil: ViewUtil,

        mainExecutor: DelayableExecutor,

        accessibilityManager: AccessibilityManager,

        configurationController: ConfigurationController,

        powerManager: PowerManager,

        @Main private val mainHandler: Handler,

        private val uiEventLogger: MediaTttReceiverUiEventLogger,

) : MediaTttChipControllerCommon<ChipReceiverInfo>(

) : TemporaryViewDisplayController<ChipReceiverInfo>(

        context,

        logger,

        windowManager,

        viewUtil,

        mainExecutor,

        accessibilityManager,

        configurationController,
@@ -216,7 +213,7 @@ data class ChipReceiverInfo( 
    val routeInfo: MediaRoute2Info,

    val appIconDrawableOverride: Drawable?,

    val appNameOverride: CharSequence?

) : ChipInfoCommon {

) : TemporaryViewInfo {

    override fun getTimeoutMs() = DEFAULT_TIMEOUT_MILLIS

}

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import androidx.annotation.StringRes 
import com.android.internal.logging.UiEventLogger

import com.android.internal.statusbar.IUndoMediaTransferCallback

import com.android.systemui.R

import com.android.systemui.media.taptotransfer.common.DEFAULT_TIMEOUT_MILLIS

import com.android.systemui.temporarydisplay.DEFAULT_TIMEOUT_MILLIS



/**

 * A class enumerating all the possible states of the media tap-to-transfer chip on the sender

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

+6 −9
Original line number Diff line number Diff line
@@ -33,14 +33,13 @@ import com.android.systemui.animation.Interpolators 
import com.android.systemui.animation.ViewHierarchyAnimator

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.media.taptotransfer.common.ChipInfoCommon

import com.android.systemui.media.taptotransfer.common.MediaTttChipControllerCommon

import com.android.systemui.media.taptotransfer.common.MediaTttLogger

import com.android.systemui.media.taptotransfer.common.MediaTttRemovalReason

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

import com.android.systemui.temporarydisplay.TemporaryViewInfo

import com.android.systemui.util.concurrency.DelayableExecutor

import com.android.systemui.util.view.ViewUtil

import javax.inject.Inject



/**
@@ -53,17 +52,15 @@ class MediaTttChipControllerSender @Inject constructor( 
        context: Context,

        @MediaTttSenderLogger logger: MediaTttLogger,

        windowManager: WindowManager,

        viewUtil: ViewUtil,

        @Main mainExecutor: DelayableExecutor,

        accessibilityManager: AccessibilityManager,

        configurationController: ConfigurationController,

        powerManager: PowerManager,

        private val uiEventLogger: MediaTttSenderUiEventLogger

) : MediaTttChipControllerCommon<ChipSenderInfo>(

) : TemporaryViewDisplayController<ChipSenderInfo>(

        context,

        logger,

        windowManager,

        viewUtil,

        mainExecutor,

        accessibilityManager,

        configurationController,
@@ -169,7 +166,7 @@ class MediaTttChipControllerSender @Inject constructor( 
        // Don't remove the chip if we're mid-transfer since the user should still be able to

        // see the status of the transfer. (But do remove it if it's finally timed out.)

        if (chipInfo?.state?.isMidTransfer == true &&

                removalReason != MediaTttRemovalReason.REASON_TIMEOUT) {

                removalReason != TemporaryDisplayRemovalReason.REASON_TIMEOUT) {

            return

        }

        super.removeChip(removalReason)
@@ -188,7 +185,7 @@ data class ChipSenderInfo( 
    val state: ChipStateSender,

    val routeInfo: MediaRoute2Info,

    val undoCallback: IUndoMediaTransferCallback? = null

) : ChipInfoCommon {

) : TemporaryViewInfo {

    override fun getTimeoutMs() = state.timeout

}

packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt→packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt

+17 −17
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.media.taptotransfer.common

package com.android.systemui.temporarydisplay



import android.annotation.LayoutRes

import android.annotation.SuppressLint
@@ -37,25 +37,25 @@ import com.android.internal.widget.CachingIconView 
import com.android.settingslib.Utils

import com.android.systemui.R

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

import com.android.systemui.util.view.ViewUtil



/**

 * A superclass controller that provides common functionality for showing chips on the sender device

 * and the receiver device.

 * A generic controller that can temporarily display a new view in a new window.

 *

 * Subclasses need to override and implement [updateChipView], which is where they can control what

 * gets displayed to the user.

 *

 * The generic type T is expected to contain all the information necessary for the subclasses to

 * display the chip in a certain state, since they receive <T> in [updateChipView].

 *

 * TODO(b/245610654): Remove all the media-specific logic from this class.

 */

abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>(

abstract class TemporaryViewDisplayController<T : TemporaryViewInfo>(

    internal val context: Context,

    internal val logger: MediaTttLogger,

    internal val windowManager: WindowManager,

        private val viewUtil: ViewUtil,

    @Main private val mainExecutor: DelayableExecutor,

    private val accessibilityManager: AccessibilityManager,

    private val configurationController: ConfigurationController,
@@ -131,7 +131,7 @@ abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>( 
       )

        cancelChipViewTimeout?.run()

        cancelChipViewTimeout = mainExecutor.executeDelayed(

            { removeChip(MediaTttRemovalReason.REASON_TIMEOUT) },

            { removeChip(TemporaryDisplayRemovalReason.REASON_TIMEOUT) },

            timeout.toLong()

        )

    }
@@ -264,9 +264,9 @@ abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>( 
// Used in CTS tests UpdateMediaTapToTransferSenderDisplayTest and

// UpdateMediaTapToTransferReceiverDisplayTest

private const val WINDOW_TITLE = "Media Transfer Chip View"

private val TAG = MediaTttChipControllerCommon::class.simpleName!!

private val TAG = TemporaryViewDisplayController::class.simpleName!!



object MediaTttRemovalReason {

object TemporaryDisplayRemovalReason {

    const val REASON_TIMEOUT = "TIMEOUT"

    const val REASON_SCREEN_TAP = "SCREEN_TAP"

}