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

Commit 8cd66d93 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge changes I5f40ffba,I7dc249df,Idde72a4f into udc-qpr-dev am: 712c6bbb 

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



Change-Id: I483da887f8157c21c489c464061aac8f3703388c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31127e29 712c6bbb

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

+2 −2
Original line number Diff line number Diff line
@@ -223,10 +223,10 @@ public interface SysUIComponent { 
    Optional<NaturalRotationUnfoldProgressProvider> getNaturalRotationUnfoldProgressProvider();



    /** */

    Optional<MediaMuteAwaitConnectionCli> getMediaMuteAwaitConnectionCli();

    MediaMuteAwaitConnectionCli getMediaMuteAwaitConnectionCli();



    /** */

    Optional<NearbyMediaDevicesManager> getNearbyMediaDevicesManager();

    NearbyMediaDevicesManager getNearbyMediaDevicesManager();



    /**

     * Returns {@link CoreStartable}s that should be started with the application.

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −9
Original line number Diff line number Diff line
@@ -416,12 +416,6 @@ object Flags { 
    // TODO(b/254512502): Tracking Bug

    val MEDIA_SESSION_ACTIONS = unreleasedFlag(901, "media_session_actions")



    // TODO(b/254512726): Tracking Bug

    val MEDIA_NEARBY_DEVICES = releasedFlag(903, "media_nearby_devices")



    // TODO(b/254512695): Tracking Bug

    val MEDIA_MUTE_AWAIT = releasedFlag(904, "media_mute_await")



    // TODO(b/254512654): Tracking Bug

    @JvmField val DREAM_MEDIA_COMPLICATION = unreleasedFlag(905, "dream_media_complication")
@@ -437,9 +431,6 @@ object Flags { 
    // TODO(b/263272731): Tracking Bug

    val MEDIA_TTT_RECEIVER_SUCCESS_RIPPLE = releasedFlag(910, "media_ttt_receiver_success_ripple")



    // TODO(b/265813373): Tracking Bug

    val MEDIA_TAP_TO_TRANSFER_DISMISS_GESTURE = releasedFlag(912, "media_ttt_dismiss_gesture")



    // TODO(b/266157412): Tracking Bug

    val MEDIA_RETAIN_SESSIONS = unreleasedFlag(913, "media_retain_sessions")

packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDeviceManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ constructor( 
        val oldKey: String?,

        val controller: MediaController?,

        val localMediaManager: LocalMediaManager,

        val muteAwaitConnectionManager: MediaMuteAwaitConnectionManager?

        val muteAwaitConnectionManager: MediaMuteAwaitConnectionManager,

    ) :

        LocalMediaManager.DeviceCallback,

        MediaController.Callback(),
@@ -180,7 +180,7 @@ constructor( 
                if (!started) {

                    localMediaManager.registerCallback(this)

                    localMediaManager.startScan()

                    muteAwaitConnectionManager?.startListening()

                    muteAwaitConnectionManager.startListening()

                    playbackType = controller?.playbackInfo?.playbackType ?: PLAYBACK_TYPE_UNKNOWN

                    playbackVolumeControlId = controller?.playbackInfo?.volumeControlId

                    controller?.registerCallback(this)
@@ -198,7 +198,7 @@ constructor( 
                    controller?.unregisterCallback(this)

                    localMediaManager.stopScan()

                    localMediaManager.unregisterCallback(this)

                    muteAwaitConnectionManager?.stopListening()

                    muteAwaitConnectionManager.stopListening()

                    configurationController.removeCallback(configListener)

                }

            }

packages/SystemUI/src/com/android/systemui/media/controls/util/MediaFlags.kt

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ class MediaFlags @Inject constructor(private val featureFlags: FeatureFlags) { 
        return enabled || featureFlags.isEnabled(Flags.MEDIA_SESSION_ACTIONS)

    }



    /** Check whether we support displaying information about mute await connections. */

    fun areMuteAwaitConnectionsEnabled() = featureFlags.isEnabled(Flags.MEDIA_MUTE_AWAIT)



    /**

     * Check whether we enable support for nearby media devices. See

     * [android.app.StatusBarManager.registerNearbyMediaDevicesProvider] for more information.

     */

    fun areNearbyMediaDevicesEnabled() = featureFlags.isEnabled(Flags.MEDIA_NEARBY_DEVICES)



    /**

     * If true, keep active media controls for the lifetime of the MediaSession, regardless of

     * whether the underlying notification was dismissed

packages/SystemUI/src/com/android/systemui/media/dagger/MediaModule.java

+0 −28
Original line number Diff line number Diff line
@@ -23,10 +23,7 @@ import com.android.systemui.media.controls.pipeline.MediaDataManager; 
import com.android.systemui.media.controls.ui.MediaHierarchyManager;

import com.android.systemui.media.controls.ui.MediaHost;

import com.android.systemui.media.controls.ui.MediaHostStatesManager;

import com.android.systemui.media.controls.util.MediaFlags;

import com.android.systemui.media.dream.dagger.MediaComplicationComponent;

import com.android.systemui.media.muteawait.MediaMuteAwaitConnectionCli;

import com.android.systemui.media.nearby.NearbyMediaDevicesManager;

import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper;

import com.android.systemui.media.taptotransfer.MediaTttFlags;

import com.android.systemui.media.taptotransfer.receiver.MediaTttReceiverLogBuffer;
@@ -119,29 +116,4 @@ public interface MediaModule { 
        }

        return Optional.of(helperLazy.get());

    }



    /** */

    @Provides

    @SysUISingleton

    static Optional<MediaMuteAwaitConnectionCli> providesMediaMuteAwaitConnectionCli(

            MediaFlags mediaFlags,

            Lazy<MediaMuteAwaitConnectionCli> muteAwaitConnectionCliLazy

    ) {

        if (!mediaFlags.areMuteAwaitConnectionsEnabled()) {

            return Optional.empty();

        }

        return Optional.of(muteAwaitConnectionCliLazy.get());

    }



    /** */

    @Provides

    @SysUISingleton

    static Optional<NearbyMediaDevicesManager> providesNearbyMediaDevicesManager(

            MediaFlags mediaFlags,

            Lazy<NearbyMediaDevicesManager> nearbyMediaDevicesManagerLazy) {

        if (!mediaFlags.areNearbyMediaDevicesEnabled()) {

            return Optional.empty();

        }

        return Optional.of(nearbyMediaDevicesManagerLazy.get());

    }

}