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

Commit 4503c550 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android (Google) Code Review
Browse files

Revert "Fix the layout of the grid option customization (2/2)" 

Revert submission 30598118-grid_layout_fix

Reason for revert: b/381973672

Reverted changes: /q/submissionid:30598118-grid_layout_fix

Change-Id: I2e6445e248afe9c0a6e58d23e9faa983b3864007
parent b8738aab

res/layout/fragment_grid.xml

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

res/layout/grid_option.xml

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

src/com/android/customization/picker/grid/ui/binder/GridScreenBinder.kt

+7 −6
Original line number Diff line number Diff line
@@ -36,9 +36,6 @@ import kotlinx.coroutines.CoroutineDispatcher 
import kotlinx.coroutines.launch



object GridScreenBinder {



    const val GRID_ITEM_SPACING_DP = 20



    fun bind(

        view: View,

        viewModel: GridScreenViewModel,
@@ -50,8 +47,12 @@ object GridScreenBinder { 
    ) {

        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 @@ object GridScreenBinder { 
                bindIcon = { foregroundView: View, gridIcon: GridIconViewModel ->

                    val imageView = foregroundView as? ImageView

                    imageView?.let { GridIconViewBinder.bind(imageView, gridIcon) }

                },

                }

            )

        optionView.adapter = adapter