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

Commit 63b029b5 authored by Alex Shabalin's avatar Alex Shabalin Committed by Alexandr Shabalin
Browse files

Add a ripple highlight for the Output Switcher list items. 

Bug: 386411078
Flag: com.android.media.flags.enable_output_switcher_redesign
Test: On a physical device.
Change-Id: Ice1cdd37d0c3f7b58c3bf08abd52601df030c31c
parent b9a00040

packages/SystemUI/res/layout/media_output_list_item_device.xml

+3 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:background="?android:attr/selectableItemBackground"

        android:background="@drawable/media_output_dialog_item_button_ripple"

        android:focusable="true"

        android:orientation="horizontal"

        android:layout_marginHorizontal="@dimen/media_output_dialog_margin_horizontal"
@@ -107,8 +107,7 @@ 
            android:id="@+id/ongoing_session_button"

            style="@style/MediaOutput.Item.Icon"

            android:src="@drawable/ic_sound_bars_anim"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:focusable="true"

            android:background="@drawable/media_output_dialog_item_button_ripple"

            android:contentDescription="@string/accessibility_open_application"

            android:layout_marginStart="@dimen/media_output_item_horizontal_gap"

            android:visibility="gone"
@@ -119,8 +118,7 @@ 
            style="@style/MediaOutput.Item.Icon"

            android:layout_marginStart="@dimen/media_output_item_horizontal_gap"

            android:src="@drawable/ic_add_circle_rounded"

            android:background="@drawable/media_output_dialog_round_button_ripple"

            android:focusable="true"

            android:background="@drawable/media_output_dialog_item_button_ripple"

            android:contentDescription="@null"

            android:visibility="gone"

            tools:visibility="visible"/>

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputAdapter.kt

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


import android.content.Context

import android.content.res.ColorStateList

import android.graphics.Color

import android.graphics.Typeface

import android.graphics.drawable.AnimatedVectorDrawable

import android.graphics.drawable.Drawable
@@ -197,13 +196,27 @@ class MediaOutputAdapter(controller: MediaSwitchingController) : 


        private val mInactivePadding =

            mContext.resources.getDimension(R.dimen.media_output_item_content_vertical_margin)



        private val mActivePadding =

            mContext.resources.getDimension(

                R.dimen.media_output_item_content_vertical_margin_active

            )



        private val mSubtitleAlpha =

            mContext.resources.getFloat(R.dimen.media_output_item_subtitle_alpha)



        private val mButtonRippleBackground =

            AppCompatResources.getDrawable(

                mContext,

                R.drawable.media_output_dialog_item_button_ripple,

            )



        private val mFixedVolumeContentBackground =

            AppCompatResources.getDrawable(

                mContext,

                R.drawable.media_output_dialog_item_fixed_volume_background,

            )



        fun onBindDevice(mediaItem: MediaItem, position: Int) {

            resetViewState()

            renderItem(mediaItem, position)
@@ -279,14 +292,10 @@ class MediaOutputAdapter(controller: MediaSwitchingController) : 
            if (fixedVolumeConnected) {

                mMainContent.backgroundTintList =

                    ColorStateList.valueOf(colorTheme.containerRestrictedVolumeBackground)

                mMainContent.background =

                    AppCompatResources.getDrawable(

                        mContext,

                        R.drawable.media_output_dialog_item_fixed_volume_background,

                    )

                mMainContent.background = mFixedVolumeContentBackground

            } else {

                mMainContent.background = null

                mMainContent.setBackgroundColor(Color.TRANSPARENT)

                mMainContent.backgroundTintList = null

                mMainContent.background = mButtonRippleBackground

            }

        }