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

Commit 090a001e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I59ef37d2,Ia933b9c0 

* changes:
  [Media TTT] Use the app's package name to fetch the icon content description.
  [Media TTT] Use the app's package name to fetch its icon.
parents 813b8298 2e21b11a

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

+7 −4
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ class MediaTttCommandLineHelper @Inject constructor( 
        override fun execute(pw: PrintWriter, args: List<String>) {

            val routeInfo = MediaRoute2Info.Builder("id", args[0])

                    .addFeature("feature")

                    .setPackageName(TEST_PACKAGE_NAME)

                    .build()



            val commandName = args[1]
@@ -137,6 +138,11 @@ class MediaTttCommandLineHelper @Inject constructor( 
        override fun execute(pw: PrintWriter, args: List<String>) {

            val statusBarManager = context.getSystemService(Context.STATUS_BAR_SERVICE)

                    as StatusBarManager

            val routeInfo = MediaRoute2Info.Builder("id", "Test Name")

                .addFeature("feature")

                .setPackageName(TEST_PACKAGE_NAME)

                .build()



            when(val commandName = args[0]) {

                CLOSE_TO_SENDER_STATE ->

                    statusBarManager.updateMediaTapToTransferReceiverDisplay(
@@ -170,7 +176,4 @@ const val CLOSE_TO_SENDER_STATE = "CloseToSender" 
@VisibleForTesting

const val FAR_FROM_SENDER_STATE = "FarFromSender"

private const val CLI_TAG = "MediaTransferCli"



private val routeInfo = MediaRoute2Info.Builder("id", "Test Name")

    .addFeature("feature")

    .build()
 
 No newline at end of file
 
private const val TEST_PACKAGE_NAME = "com.android.systemui"

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

+11 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context 
import android.graphics.PixelFormat

import android.view.Gravity

import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.view.WindowManager

import com.android.internal.widget.CachingIconView
@@ -100,10 +101,17 @@ abstract class MediaTttChipControllerCommon<T : MediaTttChipState>( 
     * This is in the common superclass since both the sender and the receiver show an icon.

     */

    internal fun setIcon(chipState: T, currentChipView: ViewGroup) {

        currentChipView.findViewById<CachingIconView>(R.id.app_icon).apply {

            this.setImageDrawable(chipState.appIconDrawable)

            this.contentDescription = chipState.appIconContentDescription

        val appIconView = currentChipView.requireViewById<CachingIconView>(R.id.app_icon)

        appIconView.contentDescription = chipState.getAppName(context)



        val appIcon = chipState.getAppIcon(context)

        val visibility = if (appIcon != null) {

            View.VISIBLE

        } else {

            View.GONE

        }

        appIconView.setImageDrawable(appIcon)

        appIconView.visibility = visibility

    }

}

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

+32 −5
Original line number Diff line number Diff line
@@ -16,15 +16,42 @@ 


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



import android.content.Context

import android.content.pm.PackageManager

import android.graphics.drawable.Drawable

import android.util.Log



/**

 * A superclass chip state that will be subclassed by the sender chip and receiver chip.

 *

 * @property appIconDrawable a drawable representing the icon of the app playing the media.

 * @property appIconContentDescription a string to use as the content description for the icon.

 * @property appPackageName the package name of the app playing the media. Will be used to fetch the

 *   app icon and app name.

 */

open class MediaTttChipState(

    internal val appIconDrawable: Drawable,

    internal val appIconContentDescription: String

)
 
    internal val appPackageName: String?,

) {

    fun getAppIcon(context: Context): Drawable? {

        appPackageName ?: return null

        return try {

            context.packageManager.getApplicationIcon(appPackageName)

        } catch (e: PackageManager.NameNotFoundException) {

            Log.w(TAG, "Cannot find icon for package $appPackageName", e)

            null

        }

    }



    /** Returns the name of the app playing the media or null if we can't find it. */

    fun getAppName(context: Context): String? {

        appPackageName ?: return null

        return try {

            context.packageManager.getApplicationInfo(

                appPackageName, PackageManager.ApplicationInfoFlags.of(0)

            ).loadLabel(context.packageManager).toString()

        } catch (e: PackageManager.NameNotFoundException) {

            Log.w(TAG, "Cannot find name for package $appPackageName", e)

            null

        }

    }

}



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

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

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


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



import android.graphics.drawable.Drawable

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



/**
@@ -24,6 +23,5 @@ import com.android.systemui.media.taptotransfer.common.MediaTttChipState 
 * the receiver device.

 */

class ChipStateReceiver(

    appIconDrawable: Drawable,

    appIconContentDescription: String

) : MediaTttChipState(appIconDrawable, appIconContentDescription)
 
    appPackageName: String?,

) : MediaTttChipState(appPackageName)

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

+2 −10
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package com.android.systemui.media.taptotransfer.receiver 


import android.app.StatusBarManager

import android.content.Context

import android.graphics.Color

import android.graphics.drawable.Icon

import android.media.MediaRoute2Info

import android.util.Log

import android.view.ViewGroup
@@ -43,12 +41,6 @@ class MediaTttChipControllerReceiver @Inject constructor( 
) : MediaTttChipControllerCommon<ChipStateReceiver>(

    context, windowManager, R.layout.media_ttt_chip_receiver

) {

    // TODO(b/216141279): Use app icon from media route info instead of this fake one.

    private val fakeAppIconDrawable =

        Icon.createWithResource(context, R.drawable.ic_avatar_user).loadDrawable(context).also {

            it.setTint(Color.YELLOW)

        }



    private val commandQueueCallbacks = object : CommandQueue.Callbacks {

        override fun updateMediaTapToTransferReceiverDisplay(

            @StatusBarManager.MediaTransferReceiverState displayState: Int,
@@ -70,7 +62,7 @@ class MediaTttChipControllerReceiver @Inject constructor( 
    ) {

        when(displayState) {

            StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER ->

                displayChip(ChipStateReceiver(fakeAppIconDrawable, routeInfo.name.toString()))

                displayChip(ChipStateReceiver(routeInfo.packageName))

            StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER -> removeChip()

            else ->

                Log.e(RECEIVER_TAG, "Unhandled MediaTransferReceiverState $displayState")
@@ -82,4 +74,4 @@ class MediaTttChipControllerReceiver @Inject constructor( 
    }

}



private const val RECEIVER_TAG = "MediaTapToTransferReceiver"
 
private const val RECEIVER_TAG = "MediaTapToTransferRcvr"