PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2a9fe0e91d

Change-Id: I6d1ee50345ae45ab48162b017197e1556621fcaa
This commit is contained in:
Doris Ling
2018-03-30 03:21:18 +00:00
committed by android-build-merger
parent ffb6e93128 2a9fe0e91d
commit cb521bdd39
4 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
res/layout/suggestion_tile.xml
View File

@@ -47,16 +47,23 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="6dp" /> android:layout_marginBottom="6dp" />
<ImageView
<FrameLayout
android:id="@+id/close_button" android:id="@+id/close_button"
android:layout_width="18dp" android:layout_width="48dp"
android:layout_height="18dp" android:layout_height="48dp"
android:alpha="0.54"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="8dp" android:paddingTop="8dp"
android:layout_marginEnd="8dp" android:paddingEnd="8dp"
android:contentDescription="@string/dlg_close" android:orientation="horizontal"
android:src="@drawable/ic_suggestion_close_button"/> android:contentDescription="@string/dlg_close">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="end|top"
android:alpha="0.54"
android:src="@drawable/ic_suggestion_close_button"/>
</FrameLayout>
</RelativeLayout> </RelativeLayout>

23
res/layout/suggestion_tile_two_cards.xml
View File

@@ -44,16 +44,23 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="8dp" /> android:layout_marginBottom="8dp" />
<ImageView <FrameLayout
android:id="@+id/close_button" android:id="@+id/close_button"
android:layout_width="18dp" android:layout_width="48dp"
android:layout_height="18dp" android:layout_height="48dp"
android:alpha="0.54"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="8dp" android:gravity="end|top"
android:layout_marginEnd="8dp" android:paddingTop="8dp"
android:contentDescription="@string/dlg_close" android:paddingEnd="8dp"
android:src="@drawable/ic_suggestion_close_button"/> 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:src="@drawable/ic_suggestion_close_button"/>
</FrameLayout>
</RelativeLayout> </RelativeLayout>

22
res/layout/suggestion_tile_with_button.xml
View File

@@ -46,16 +46,22 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="6dp" /> android:layout_marginBottom="6dp" />
<ImageView <FrameLayout
android:id="@+id/close_button" android:id="@+id/close_button"
android:layout_width="18dp" android:layout_width="48dp"
android:layout_height="18dp" android:layout_height="48dp"
android:alpha="0.54"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="8dp" android:paddingTop="8dp"
android:layout_marginEnd="8dp" android:paddingEnd="8dp"
android:contentDescription="@string/dlg_close" android:orientation="horizontal"
android:src="@drawable/ic_suggestion_close_button"/> android:contentDescription="@string/dlg_close">
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="end|top"
android:alpha="0.54"
android:src="@drawable/ic_suggestion_close_button"/>
</FrameLayout>
</RelativeLayout> </RelativeLayout>

2
src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
View File

@@ -140,7 +140,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
mConfig.setCardLayout(holder, position); 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) { if (closeButton != null) {
closeButton.setOnClickListener(v -> { closeButton.setOnClickListener(v -> {
mSuggestionFeatureProvider.dismissSuggestion( mSuggestionFeatureProvider.dismissSuggestion(