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

Commit d4830410 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Increase touch target for suggestion close button." into pi-dev

parents 0ae4204f 39cd1d8f

res/layout/suggestion_tile.xml

+15 −8
Original line number Diff line number Diff line
@@ -47,16 +47,23 @@ 
                android:layout_marginTop="16dp"

                android:layout_marginBottom="6dp" />



            <ImageView



            <FrameLayout

                android:id="@+id/close_button"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_alignParentEnd="true"

                android:paddingTop="8dp"

                android:paddingEnd="8dp"

                android:orientation="horizontal"

                android:contentDescription="@string/dlg_close">

                <ImageView

                    android:layout_width="18dp"

                    android:layout_height="18dp"

                    android:layout_gravity="end|top"

                    android:alpha="0.54"

                android:layout_alignParentEnd="true"

                android:layout_marginTop="8dp"

                android:layout_marginEnd="8dp"

                android:contentDescription="@string/dlg_close"

                    android:src="@drawable/ic_suggestion_close_button"/>

            </FrameLayout>



        </RelativeLayout>

res/layout/suggestion_tile_two_cards.xml

+15 −8
Original line number Diff line number Diff line
@@ -44,16 +44,23 @@ 
                android:layout_marginTop="16dp"

                android:layout_marginBottom="8dp" />



            <ImageView

            <FrameLayout

                android:id="@+id/close_button"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_alignParentEnd="true"

                android:gravity="end|top"

                android:paddingTop="8dp"

                android:paddingEnd="8dp"

                android:orientation="horizontal"

                android:contentDescription="@string/dlg_close">

                <ImageView

                    android:layout_width="18dp"

                    android:layout_height="18dp"

                    android:layout_gravity="end|top"

                    android:alpha="0.54"

                android:layout_alignParentEnd="true"

                android:layout_marginTop="8dp"

                android:layout_marginEnd="8dp"

                android:contentDescription="@string/dlg_close"

                    android:src="@drawable/ic_suggestion_close_button"/>

            </FrameLayout>



        </RelativeLayout>

res/layout/suggestion_tile_with_button.xml

+14 −8
Original line number Diff line number Diff line
@@ -46,16 +46,22 @@ 
                android:layout_marginTop="16dp"

                android:layout_marginBottom="6dp" />



            <ImageView

            <FrameLayout

                android:id="@+id/close_button"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_alignParentEnd="true"

                android:paddingTop="8dp"

                android:paddingEnd="8dp"

                android:orientation="horizontal"

                android:contentDescription="@string/dlg_close">

                <ImageView

                    android:layout_width="18dp"

                    android:layout_height="18dp"

                    android:layout_gravity="end|top"

                    android:alpha="0.54"

                android:layout_alignParentEnd="true"

                android:layout_marginTop="8dp"

                android:layout_marginEnd="8dp"

                android:contentDescription="@string/dlg_close"

                    android:src="@drawable/ic_suggestion_close_button"/>

            </FrameLayout>



        </RelativeLayout>

src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder> 
            mConfig.setCardLayout(holder, position);

        }



        final ImageView closeButton = holder.itemView.findViewById(R.id.close_button);

        final View closeButton = holder.itemView.findViewById(R.id.close_button);

        if (closeButton != null) {

            closeButton.setOnClickListener(v -> {

                mSuggestionFeatureProvider.dismissSuggestion(