Merge "Add a ripple highlight for the Output Switcher list items." into main (5244e9d8) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/drawable/media_output_dialog_round_button_ripple.xml→packages/SystemUI/res/drawable/media_output_dialog_item_button_ripple.xml

+0 −0

File moved.

packages/SystemUI/res/layout/media_output_list_item_device.xml

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:gravity="start\|center_vertical"		android:gravity="start\|center_vertical"
	android:background="?android:attr/selectableItemBackground"		android:background="@drawable/media_output_dialog_item_button_ripple"
	android:focusable="true"		android:focusable="true"
	android:orientation="horizontal"		android:orientation="horizontal"
	android:layout_marginHorizontal="@dimen/media_output_dialog_margin_horizontal"		android:layout_marginHorizontal="@dimen/media_output_dialog_margin_horizontal"
	@@ -107,8 +107,7 @@
	android:id="@+id/ongoing_session_button"		android:id="@+id/ongoing_session_button"
	style="@style/MediaOutput.Item.Icon"		style="@style/MediaOutput.Item.Icon"
	android:src="@drawable/ic_sound_bars_anim"		android:src="@drawable/ic_sound_bars_anim"
	android:background="?android:attr/selectableItemBackgroundBorderless"		android:background="@drawable/media_output_dialog_item_button_ripple"
	android:focusable="true"
	android:contentDescription="@string/accessibility_open_application"		android:contentDescription="@string/accessibility_open_application"
	android:layout_marginStart="@dimen/media_output_item_horizontal_gap"		android:layout_marginStart="@dimen/media_output_item_horizontal_gap"
	android:visibility="gone"		android:visibility="gone"
	@@ -119,8 +118,7 @@
	style="@style/MediaOutput.Item.Icon"		style="@style/MediaOutput.Item.Icon"
	android:layout_marginStart="@dimen/media_output_item_horizontal_gap"		android:layout_marginStart="@dimen/media_output_item_horizontal_gap"
	android:src="@drawable/ic_add_circle_rounded"		android:src="@drawable/ic_add_circle_rounded"
	android:background="@drawable/media_output_dialog_round_button_ripple"		android:background="@drawable/media_output_dialog_item_button_ripple"
	android:focusable="true"
	android:contentDescription="@null"		android:contentDescription="@null"
	android:visibility="gone"		android:visibility="gone"
	tools:visibility="visible"/>		tools:visibility="visible"/>

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

+17 −8

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

	import android.content.Context		import android.content.Context
	import android.content.res.ColorStateList		import android.content.res.ColorStateList
	import android.graphics.Color
	import android.graphics.Typeface		import android.graphics.Typeface
	import android.graphics.drawable.AnimatedVectorDrawable		import android.graphics.drawable.AnimatedVectorDrawable
	import android.graphics.drawable.Drawable		import android.graphics.drawable.Drawable
	@@ -197,13 +196,27 @@ class MediaOutputAdapter(controller: MediaSwitchingController) :

	private val mInactivePadding =		private val mInactivePadding =
	mContext.resources.getDimension(R.dimen.media_output_item_content_vertical_margin)		mContext.resources.getDimension(R.dimen.media_output_item_content_vertical_margin)

	private val mActivePadding =		private val mActivePadding =
	mContext.resources.getDimension(		mContext.resources.getDimension(
	R.dimen.media_output_item_content_vertical_margin_active		R.dimen.media_output_item_content_vertical_margin_active
	)		)

	private val mSubtitleAlpha =		private val mSubtitleAlpha =
	mContext.resources.getFloat(R.dimen.media_output_item_subtitle_alpha)		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) {		fun onBindDevice(mediaItem: MediaItem, position: Int) {
	resetViewState()		resetViewState()
	renderItem(mediaItem, position)		renderItem(mediaItem, position)
	@@ -279,14 +292,10 @@ class MediaOutputAdapter(controller: MediaSwitchingController) :
	if (fixedVolumeConnected) {		if (fixedVolumeConnected) {
	mMainContent.backgroundTintList =		mMainContent.backgroundTintList =
	ColorStateList.valueOf(colorTheme.containerRestrictedVolumeBackground)		ColorStateList.valueOf(colorTheme.containerRestrictedVolumeBackground)
	mMainContent.background =		mMainContent.background = mFixedVolumeContentBackground
	AppCompatResources.getDrawable(
	mContext,
	R.drawable.media_output_dialog_item_fixed_volume_background,
	)
	} else {		} else {
	mMainContent.background = null		mMainContent.backgroundTintList = null
	mMainContent.setBackgroundColor(Color.TRANSPARENT)		mMainContent.background = mButtonRippleBackground
	}		}
	}		}