diff options
| author | 2019-05-02 15:13:26 +0000 | |
|---|---|---|
| committer | 2019-05-02 15:13:26 +0000 | |
| commit | ff7fc1de48795888b29febdcfb7d8d7d864c4a1a (patch) | |
| tree | 6ba4ce4914d99fb91ea5837e0427648a845fa4fc | |
| parent | 61c8bb74e6ea0f9f7c4e874d25bbf0a009501b4e (diff) | |
| parent | 84a55bd5eb1c82959acccd977470c02ef23deb40 (diff) | |
Merge "Sharesheet - Make ripples consistent" into qt-dev
| -rw-r--r-- | core/java/com/android/internal/app/ChooserActivity.java | 4 | ||||
| -rw-r--r-- | 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 96331c25021f..659272c81733 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -2881,10 +2881,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 e889e8584fec..96a642c6d446 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"> <ImageView android:layout_width="24dp" |