Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move ripple initialization to view holder" into rvc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2020-05-18 16:13:22 +00:00
committed by Android (Google) Code Review
parent 31db4f456b d621692934
commit f7b6901230
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -323,10 +323,6 @@ public class MediaControlPanel {
setVisibleAndAlpha(collapsedSet, R.id.media_seamless, true /*visible */); setVisibleAndAlpha(collapsedSet, R.id.media_seamless, true /*visible */);
setVisibleAndAlpha(expandedSet, R.id.media_seamless, true /*visible */); setVisibleAndAlpha(expandedSet, R.id.media_seamless, true /*visible */);
updateDevice(mLocalMediaManager.getCurrentConnectedDevice()); updateDevice(mLocalMediaManager.getCurrentConnectedDevice());
if (mViewHolder.getBackground().getBackground() instanceof IlluminationDrawable) {
((IlluminationDrawable) mViewHolder.getBackground().getBackground())
.setupTouch(mViewHolder.getSeamless(), mViewHolder.getPlayer());
}
mViewHolder.getSeamless().setOnClickListener(v -> { mViewHolder.getSeamless().setOnClickListener(v -> {
final Intent intent = new Intent() final Intent intent = new Intent()
.setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT) .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
@@ -358,11 +354,6 @@ public class MediaControlPanel {
button.setContentDescription(mediaAction.getContentDescription()); button.setContentDescription(mediaAction.getContentDescription());
PendingIntent actionIntent = mediaAction.getIntent(); PendingIntent actionIntent = mediaAction.getIntent();
if (mViewHolder.getBackground().getBackground() instanceof IlluminationDrawable) {
((IlluminationDrawable) mViewHolder.getBackground().getBackground())
.setupTouch(button, mViewHolder.getPlayer());
}
button.setOnClickListener(v -> { button.setOnClickListener(v -> {
if (actionIntent != null) { if (actionIntent != null) {
try { try {

11
packages/SystemUI/src/com/android/systemui/media/PlayerViewHolder.kt
View File

@@ -60,6 +60,17 @@ class PlayerViewHolder private constructor(itemView: View) {
val action3 = itemView.requireViewById<ImageButton>(R.id.action3) val action3 = itemView.requireViewById<ImageButton>(R.id.action3)
val action4 = itemView.requireViewById<ImageButton>(R.id.action4) val action4 = itemView.requireViewById<ImageButton>(R.id.action4)
init {
(background.background as IlluminationDrawable).let {
it.setupTouch(seamless, player)
it.setupTouch(action0, player)
it.setupTouch(action1, player)
it.setupTouch(action2, player)
it.setupTouch(action3, player)
it.setupTouch(action4, player)
}
}
fun getAction(id: Int): ImageButton { fun getAction(id: Int): ImageButton {
return when (id) { return when (id) {
R.id.action0 -> action0 R.id.action0 -> action0