Merge "Grid item fixups."

<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"

    <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>

    <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>

    <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>

                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);