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

Commit 2d07c7a4 authored by Catherine Liang's avatar Catherine Liang
Browse files

Pre-revamped UI cleanup grid option rename 

Rename grid option to replace pre-revamped UI grid option.

Bug: 262780002
Test: manually verified
Change-Id: I5cc0dcb2fd38371a14b997422a1c233a9433aa75
parent 76c82d80

res/layout/fragment_grid.xml

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
            It's critical for any TextViews inside the included layout to have text.

            -->

            <include

                layout="@layout/grid_option_2"

                layout="@layout/grid_option"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:visibility="invisible" />

res/layout/grid_option_2.xml→res/layout/grid_option.xml

+0 −0

File moved.

View file

src/com/android/customization/model/grid/GridOption.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ public class GridOption implements CustomizationOption<GridOption>, Parcelable { 


    @Override

    public int getLayoutResId() {

        return R.layout.grid_option_2;

        return R.layout.grid_option;

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ object GridScreenBinder { 
        optionView.addItemDecoration(ItemSpacing(ItemSpacing.ITEM_SPACING_DP))

        val adapter =

            OptionItemAdapter(

                layoutResourceId = R.layout.grid_option_2,

                layoutResourceId = R.layout.grid_option,

                lifecycleOwner = lifecycleOwner,

                backgroundDispatcher = backgroundDispatcher,

                foregroundTintSpec =