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

Commit 7c118c2b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Get device icon without background." into rvc-dev am: 6e63bf8d 

Change-Id: I9ff31f412a0d26a34207590eaec8409987434de4
parents 12fb27e3 6e63bf8d

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ class MediaDeviceManager @Inject constructor( 


    private fun processDevice(key: String, device: MediaDevice?) {

        val enabled = device != null

        val data = MediaDeviceData(enabled, device?.icon, device?.name)

        val data = MediaDeviceData(enabled, device?.iconWithoutBackground, device?.name)

        listeners.forEach {

            it.onMediaDeviceChanged(key, data)

        }

packages/SystemUI/tests/src/com/android/systemui/media/MediaDeviceManagerTest.kt

+9 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.media



import android.app.Notification

import android.graphics.drawable.Drawable

import android.media.MediaMetadata

import android.media.MediaRouter2Manager

import android.media.RoutingSessionInfo
@@ -73,6 +74,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
    private lateinit var fakeExecutor: FakeExecutor

    @Mock private lateinit var listener: MediaDeviceManager.Listener

    @Mock private lateinit var device: MediaDevice

    @Mock private lateinit var icon: Drawable

    @Mock private lateinit var route: RoutingSessionInfo

    private lateinit var session: MediaSession

    private lateinit var metadataBuilder: MediaMetadata.Builder
@@ -89,6 +91,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 


        // Configure mocks.

        whenever(device.name).thenReturn(DEVICE_NAME)

        whenever(device.iconWithoutBackground).thenReturn(icon)

        whenever(lmmFactory.create(PACKAGE)).thenReturn(lmm)

        whenever(lmm.getCurrentConnectedDevice()).thenReturn(device)

        whenever(mr2.getRoutingSessionForMediaController(any())).thenReturn(route)
@@ -157,6 +160,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isTrue()

        assertThat(data.name).isEqualTo(DEVICE_NAME)

        assertThat(data.icon).isEqualTo(icon)

    }



    @Test
@@ -170,6 +174,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isTrue()

        assertThat(data.name).isEqualTo(DEVICE_NAME)

        assertThat(data.icon).isEqualTo(icon)

    }



    @Test
@@ -183,6 +188,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isTrue()

        assertThat(data.name).isEqualTo(DEVICE_NAME)

        assertThat(data.icon).isEqualTo(icon)

    }



    @Test
@@ -204,6 +210,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isFalse()

        assertThat(data.name).isNull()

        assertThat(data.icon).isNull()

    }



    @Test
@@ -221,6 +228,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isFalse()

        assertThat(data.name).isNull()

        assertThat(data.icon).isNull()

    }



    @Test
@@ -238,6 +246,7 @@ public class MediaDeviceManagerTest : SysuiTestCase() { 
        val data = captureDeviceData(KEY)

        assertThat(data.enabled).isFalse()

        assertThat(data.name).isNull()

        assertThat(data.icon).isNull()

    }



    fun captureCallback(): LocalMediaManager.DeviceCallback {