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

Commit d13f3c97 authored by Steve McKay's avatar Steve McKay
Browse files

Grid item fixups. 

Use margin instead of padding (so clicks on empty space don't do unexpected things).
Make background of items white.

Change-Id: I98996c90276911535b7addad1aad4a3c9ca47156
parent 6323fff7

packages/DocumentsUI/res/layout/item_doc_grid.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/grid_item_height"

    android:padding="@dimen/grid_item_padding">

    android:layout_margin="@dimen/grid_item_margin"

    android:background="@color/item_doc_grid_background">



    <ImageView

        android:id="@+id/icon_thumb"

packages/DocumentsUI/res/values-sw720dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
    <dimen name="grid_padding_horiz">24dp</dimen>

    <dimen name="grid_padding_vert">16dp</dimen>



    <dimen name="grid_item_padding">8dp</dimen>

    <dimen name="grid_item_margin">8dp</dimen>

</resources>

packages/DocumentsUI/res/values/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
    <color name="material_grey_300">#ffeeeeee</color>



    <color name="directory_background">@color/material_grey_300</color>

    <color name="item_doc_grid_background">#FFFFFFFF</color>

    <color name="item_doc_grid_protect_background">#88000000</color>

</resources>

packages/DocumentsUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


    <dimen name="grid_item_width">152dp</dimen>

    <dimen name="grid_item_height">176dp</dimen>

    <dimen name="grid_item_padding">4dp</dimen>

    <dimen name="grid_item_margin">4dp</dimen>



    <dimen name="grid_padding_horiz">4dp</dimen>

    <dimen name="grid_padding_vert">4dp</dimen>

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ public class DirectoryFragment extends Fragment { 
                thumbSize = getResources().getDimensionPixelSize(R.dimen.grid_width);

                if (mGridLayout == null) {

                    int itemPadding =

                            getResources().getDimensionPixelSize(R.dimen.grid_item_padding);

                            getResources().getDimensionPixelSize(R.dimen.grid_item_margin);

                    int viewPadding = mRecView.getPaddingLeft() + mRecView.getPaddingRight();

                    int columnCount =

                            (mRecView.getWidth() - viewPadding) / (thumbSize + itemPadding);