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

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

Merge "Refine style picker layout (1/2)" into ub-launcher3-master

parents db17b002 f00d164c

res/drawable/option_border_custom.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="@android:color/white"/>

            <corners android:radius="4dp" />

            <corners android:radius="8dp" />

        </shape>

    </item>

    <item android:drawable="@drawable/option_border_edge_custom" />

res/drawable/option_border_edge_custom.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
            <stroke

                android:color="@color/option_border_color"

                android:width="@dimen/option_selected_border_width" />

            <corners android:radius="4dp" />

            <corners android:radius="8dp" />

        </shape>

    </item>

    <item android:state_activated="false">
@@ -29,7 +29,7 @@ 
                android:color="@color/black_24_alpha"

                android:alpha="0.24"

                android:width="@dimen/option_border_width" />

            <corners android:radius="4dp" />

            <corners android:radius="8dp" />

        </shape>

    </item>

</selector>

src/com/android/customization/widget/OptionSelectorController.java

+4 −0
Original line number Diff line number Diff line
@@ -245,6 +245,10 @@ public class OptionSelectorController<T extends CustomizationOption<T>> { 
            int numColumns = res.getInteger(R.integer.options_grid_num_columns);

            int widthPerItem = totalWidth / mAdapter.getItemCount();

            int extraSpace = availableWidth - widthPerItem * numColumns;

            while (extraSpace < 0) {

                numColumns -= 1;

                extraSpace = availableWidth - widthPerItem * numColumns;

            }

            int containerSidePadding = extraSpace / (numColumns + 1);

            mContainer.setLayoutManager(new GridLayoutManager(mContainer.getContext(), numColumns));

            mContainer.setPaddingRelative(containerSidePadding, 0, containerSidePadding, 0);