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

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

[Media TTT] Add the background back to the receiver chip. 

Fixes: 245979191
Test: manual: See video commented on bug
Test: media.taptotransfer tests
Change-Id: I13c60b3b950ac5081766664582490e5b46283c5e
parent 3fe09355

packages/SystemUI/res/layout/media_ttt_chip_receiver.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 




    <com.android.internal.widget.CachingIconView

    <com.android.internal.widget.CachingIconView

        android:id="@+id/app_icon"

        android:id="@+id/app_icon"

        android:background="@drawable/media_ttt_chip_background_receiver"

        android:layout_width="@dimen/media_ttt_icon_size_receiver"

        android:layout_width="@dimen/media_ttt_icon_size_receiver"

        android:layout_height="@dimen/media_ttt_icon_size_receiver"

        android:layout_height="@dimen/media_ttt_icon_size_receiver"

        android:layout_gravity="center|bottom"

        android:layout_gravity="center|bottom"

packages/SystemUI/res/values/dimens.xml

+2 −3
Original line number Original line Diff line number Diff line
@@ -1056,9 +1056,8 @@ 
    <!-- Media tap-to-transfer chip for receiver device -->

    <!-- Media tap-to-transfer chip for receiver device -->

    <dimen name="media_ttt_chip_size_receiver">100dp</dimen>

    <dimen name="media_ttt_chip_size_receiver">100dp</dimen>

    <dimen name="media_ttt_icon_size_receiver">95dp</dimen>

    <dimen name="media_ttt_icon_size_receiver">95dp</dimen>

    <!-- Since the generic icon isn't circular, we need to scale it down so it still fits within

    <!-- Add some padding for the generic icon so it doesn't go all the way to the border. -->

         the circular chip. -->

    <dimen name="media_ttt_generic_icon_padding">12dp</dimen>

    <dimen name="media_ttt_generic_icon_size_receiver">70dp</dimen>

    <dimen name="media_ttt_receiver_vert_translation">20dp</dimen>

    <dimen name="media_ttt_receiver_vert_translation">20dp</dimen>





    <!-- Window magnification -->

    <!-- Window magnification -->

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

+0 −24
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.systemui.media.taptotransfer.common 
import android.content.Context

import android.content.Context

import android.content.pm.PackageManager

import android.content.pm.PackageManager

import android.graphics.drawable.Drawable

import android.graphics.drawable.Drawable

import com.android.internal.widget.CachingIconView

import com.android.settingslib.Utils

import com.android.settingslib.Utils

import com.android.systemui.R

import com.android.systemui.R
@@ -76,29 +75,6 @@ class MediaTttUtils { 
                isAppIcon = false

                isAppIcon = false

            )

            )

        }

        }



        /**

         * Sets an icon to be displayed by the given view.

         *

         * @param iconSize the size in pixels that the icon should be. If null, the size of

         * [appIconView] will not be adjusted.

         */

        fun setIcon(

            appIconView: CachingIconView,

            icon: Drawable,

            iconContentDescription: CharSequence,

            iconSize: Int? = null,

        ) {

            iconSize?.let { size ->

                val lp = appIconView.layoutParams

                lp.width = size

                lp.height = size

                appIconView.layoutParams = lp

            }



            appIconView.contentDescription = iconContentDescription

            appIconView.setImageDrawable(icon)

        }

    }

    }

}

}

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

+8 −10
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.View 
import android.view.ViewGroup

import android.view.ViewGroup

import android.view.WindowManager

import android.view.WindowManager

import android.view.accessibility.AccessibilityManager

import android.view.accessibility.AccessibilityManager

import com.android.internal.widget.CachingIconView

import com.android.settingslib.Utils

import com.android.settingslib.Utils

import com.android.systemui.R

import com.android.systemui.R

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton
@@ -146,20 +147,17 @@ class MediaTttChipControllerReceiver @Inject constructor( 
        )

        )

        val iconDrawable = newInfo.appIconDrawableOverride ?: iconInfo.drawable

        val iconDrawable = newInfo.appIconDrawableOverride ?: iconInfo.drawable

        val iconContentDescription = newInfo.appNameOverride ?: iconInfo.contentDescription

        val iconContentDescription = newInfo.appNameOverride ?: iconInfo.contentDescription

        val iconSize = context.resources.getDimensionPixelSize(

        val iconPadding =

            if (iconInfo.isAppIcon) {

            if (iconInfo.isAppIcon) {

                R.dimen.media_ttt_icon_size_receiver

                0

            } else {

            } else {

                R.dimen.media_ttt_generic_icon_size_receiver

                context.resources.getDimensionPixelSize(R.dimen.media_ttt_generic_icon_padding)

            }

            }

        )





        MediaTttUtils.setIcon(

        val iconView = currentView.requireViewById<CachingIconView>(R.id.app_icon)

            currentView.requireViewById(R.id.app_icon),

        iconView.setPadding(iconPadding, iconPadding, iconPadding, iconPadding)

            iconDrawable,

        iconView.setImageDrawable(iconDrawable)

            iconContentDescription,

        iconView.contentDescription = iconContentDescription

            iconSize,

        )

    }

    }





    override fun animateViewIn(view: ViewGroup) {

    override fun animateViewIn(view: ViewGroup) {

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.WindowManager 
import android.view.accessibility.AccessibilityManager

import android.view.accessibility.AccessibilityManager

import android.widget.TextView

import android.widget.TextView

import com.android.internal.statusbar.IUndoMediaTransferCallback

import com.android.internal.statusbar.IUndoMediaTransferCallback

import com.android.internal.widget.CachingIconView

import com.android.systemui.Gefingerpoken

import com.android.systemui.Gefingerpoken

import com.android.systemui.R

import com.android.systemui.R

import com.android.systemui.animation.Interpolators

import com.android.systemui.animation.Interpolators
@@ -145,11 +146,9 @@ class MediaTttChipControllerSender @Inject constructor( 
        val iconInfo = MediaTttUtils.getIconInfoFromPackageName(

        val iconInfo = MediaTttUtils.getIconInfoFromPackageName(

            context, newInfo.routeInfo.clientPackageName, logger

            context, newInfo.routeInfo.clientPackageName, logger

        )

        )

        MediaTttUtils.setIcon(

        val iconView = currentView.requireViewById<CachingIconView>(R.id.app_icon)

            currentView.requireViewById(R.id.app_icon),

        iconView.setImageDrawable(iconInfo.drawable)

            iconInfo.drawable,

        iconView.contentDescription = iconInfo.contentDescription

            iconInfo.contentDescription

        )





        // Text

        // Text

        val otherDeviceName = newInfo.routeInfo.name.toString()

        val otherDeviceName = newInfo.routeInfo.name.toString()