From 84a55bd5eb1c82959acccd977470c02ef23deb40 Mon Sep 17 00:00:00 2001 From: Matt Pietal Date: Wed, 1 May 2019 12:32:47 -0400 Subject: [PATCH] Sharesheet - Make ripples consistent There were differences in ripple behavior depending on the list row background. Modify this so the ripples propogate against the same parent background. Make copy button style match the work profile style. Bug: 129979196 Test: Visual inspection Change-Id: I51f1b7503c2169bd03f04edecf98927850e6582b --- core/java/com/android/internal/app/ChooserActivity.java | 4 ++-- core/res/res/layout/chooser_grid_preview_text.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 1eabbd8bd00ef..93c00d634b5ea 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -2871,10 +2871,10 @@ public class ChooserActivity extends ResolverActivity { if (startType != lastStartType || rowPosition == getContentPreviewRowCount() + getProfileRowCount()) { - row.setBackground( + row.setForeground( getResources().getDrawable(R.drawable.chooser_row_layer_list, null)); } else { - row.setBackground(null); + row.setForeground(null); } int columnCount = holder.getColumnCount(); diff --git a/core/res/res/layout/chooser_grid_preview_text.xml b/core/res/res/layout/chooser_grid_preview_text.xml index e889e8584fec0..96a642c6d4466 100644 --- a/core/res/res/layout/chooser_grid_preview_text.xml +++ b/core/res/res/layout/chooser_grid_preview_text.xml @@ -60,7 +60,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:clickable="true" - android:background="?android:attr/selectableItemBackgroundBorderless"> + style="?attr/borderlessButtonStyle">