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

Commit 8e6c24d9 authored by Matt Pietal's avatar Matt Pietal Committed by android-build-merger
Browse files

Merge "Sharesheet - Make ripples consistent" into qt-dev 

am: ff7fc1de

Change-Id: Id375bd4b1bb02c53f81167a59f3bbd2a96838471
parents 472a9205 ff7fc1de

core/java/com/android/internal/app/ChooserActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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();

core/res/res/layout/chooser_grid_preview_text.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"