Snap for 12748980 from cd10de6caa7b52e06b783946b06f7f2acdcd8b19 to 25Q1-release
Change-Id: Id1aee213b98a9d7688796a54428129788030ccff
diff --git a/res/layout/fragment_grid.xml b/res/layout/fragment_grid.xml
index 20c9069..e77da57 100644
--- a/res/layout/fragment_grid.xml
+++ b/res/layout/fragment_grid.xml
@@ -55,12 +55,13 @@
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="28dp"
android:background="@drawable/picker_fragment_background"
+ android:paddingBottom="62dp"
android:clipChildren="false">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginVertical="20dp"
+ android:layout_marginTop="22dp"
android:clipChildren="false">
<androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/grid_option.xml b/res/layout/grid_option.xml
index 459584c..efed018 100644
--- a/res/layout/grid_option.xml
+++ b/res/layout/grid_option.xml
@@ -47,8 +47,8 @@
<ImageView
android:id="@id/foreground"
- android:layout_width="48dp"
- android:layout_height="48dp"
+ android:layout_width="58dp"
+ android:layout_height="58dp"
android:layout_gravity="center" />
</FrameLayout>
@@ -64,7 +64,6 @@
android:textColor="@color/system_on_surface"
android:singleLine="true"
android:ellipsize="end"
- android:textSize="12sp"
android:text="Placeholder for stable size calculation, please do not remove."
tools:ignore="HardcodedText" />
diff --git a/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt b/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt
index ae06fff..36d16cd 100644
--- a/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt
+++ b/src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt
@@ -36,9 +36,6 @@
import kotlinx.coroutines.launch
object GridScreenBinder {
-
- const val GRID_ITEM_SPACING_DP = 20
-
fun bind(
view: View,
viewModel: GridScreenViewModel,
@@ -50,8 +47,12 @@
) {
val optionView: RecyclerView = view.requireViewById(com.android.wallpaper.R.id.options)
optionView.layoutManager =
- LinearLayoutManager(view.context, RecyclerView.HORIZONTAL, /* reverseLayout= */ false)
- optionView.addItemDecoration(ItemSpacing(GRID_ITEM_SPACING_DP))
+ LinearLayoutManager(
+ view.context,
+ RecyclerView.HORIZONTAL,
+ /* reverseLayout= */ false,
+ )
+ optionView.addItemDecoration(ItemSpacing(ItemSpacing.ITEM_SPACING_DP))
val adapter =
OptionItemAdapter(
layoutResourceId = R.layout.grid_option,
@@ -67,7 +68,7 @@
bindIcon = { foregroundView: View, gridIcon: GridIconViewModel ->
val imageView = foregroundView as? ImageView
imageView?.let { GridIconViewBinder.bind(imageView, gridIcon) }
- },
+ }
)
optionView.adapter = adapter