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

Commit 6b9b71cd authored by Jackal Guo's avatar Jackal Guo Committed by Android (Google) Code Review
Browse files

Merge "Enlarge the selection area"

parents 8c466831 2d77b5fb

res/layout-sw720dp-land/item_doc_list.xml

+9 −8
Original line number Diff line number Diff line
@@ -28,17 +28,17 @@ 
        android:baselineAligned="false"

        android:gravity="center_vertical"

        android:minHeight="@dimen/list_item_height"

        android:orientation="horizontal"

        android:paddingEnd="@dimen/list_item_padding"

        android:paddingStart="@dimen/list_item_padding" >

        android:orientation="horizontal" >



        <FrameLayout

            android:id="@android:id/icon"

            android:pointerIcon="hand"

            android:layout_width="@dimen/list_item_thumbnail_size"

            android:layout_height="@dimen/list_item_thumbnail_size"

            android:layout_marginEnd="16dp"

            android:layout_marginStart="0dp" >

            android:layout_width="@dimen/list_item_width"

            android:layout_height="@dimen/list_item_height"

            android:paddingBottom="@dimen/list_item_icon_padding"

            android:paddingTop="@dimen/list_item_icon_padding"

            android:paddingEnd="16dp"

            android:paddingStart="@dimen/list_item_padding" >



            <ImageView

                android:id="@+id/icon_mime"
@@ -74,7 +74,8 @@ 
            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:orientation="horizontal" >

            android:orientation="horizontal"

            android:paddingEnd="@dimen/list_item_padding" >



            <TextView

                android:id="@android:id/title"

res/layout/item_dir_grid.xml

+11 −8
Original line number Diff line number Diff line
@@ -41,22 +41,22 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            android:paddingBottom="9dp"

            android:paddingLeft="9dp"

            android:paddingRight="12dp"

            android:paddingTop="9dp"

            android:gravity="center_vertical">



            <FrameLayout

                android:id="@+id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:pointerIcon="hand"

                android:layout_marginEnd="8dp" >

                android:paddingBottom="9dp"

                android:paddingStart="9dp"

                android:paddingEnd="8dp"

                android:paddingTop="9dp" >



                <ImageView

                    android:id="@+id/icon_mime_sm"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_width="@dimen/grid_item_icon_size"

                    android:layout_height="@dimen/grid_item_icon_size"

                    android:layout_gravity="center"

                    android:contentDescription="@null"

                    android:scaleType="centerInside"
@@ -81,7 +81,10 @@ 
                android:singleLine="true"

                android:textAlignment="viewStart"

                android:textAppearance="@android:style/TextAppearance.Material.Subhead"

                android:textColor="@color/item_title" />

                android:textColor="@color/item_title"

                android:layout_marginBottom="9dp"

                android:layout_marginEnd="12dp"

                android:layout_marginTop="9dp" />



        </LinearLayout>

res/layout/item_doc_grid.xml

+77 −66
Original line number Diff line number Diff line
@@ -66,26 +66,31 @@ 
        <!-- Item nameplate.  Has a mime-type icon and some text fields (title,

             size, mod-time, etc). -->



        <RelativeLayout

        <LinearLayout

            android:id="@+id/nameplate"

            android:background="@drawable/grid_item_background"

            android:orientation="horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_below="@id/thumbnail"

            android:layout_below="@id/thumbnail" >



            <FrameLayout

                android:id="@+id/icon"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_centerVertical="true"

                android:pointerIcon="hand"

                android:paddingTop="8dp"

                android:paddingBottom="8dp"

            android:paddingLeft="12dp"

            android:paddingRight="12dp">

                android:paddingStart="12dp"

                android:paddingEnd="8dp" >



                <ImageView

                    android:id="@+id/icon_mime_sm"

                    android:layout_width="@dimen/grid_item_icon_size"

                    android:layout_height="@dimen/grid_item_icon_size"

                android:layout_marginEnd="8dp"

                android:layout_alignParentStart="true"

                android:layout_centerVertical="true"

                    android:layout_gravity="center"

                    android:scaleType="center"

                android:pointerIcon="hand"

                    android:contentDescription="@null"/>



                <ImageView
@@ -94,19 +99,25 @@ 
                    android:alpha="0"

                    android:layout_width="@dimen/check_icon_size"

                    android:layout_height="@dimen/check_icon_size"

                android:layout_marginEnd="8dp"

                android:layout_alignParentStart="true"

                android:layout_centerVertical="true"

                    android:layout_gravity="center"

                    android:scaleType="fitCenter"

                android:pointerIcon="hand"

                    android:contentDescription="@null"/>



            </FrameLayout>



            <RelativeLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingBottom="8dp"

                android:paddingTop="8dp"

                android:paddingEnd="12dp" >



                <TextView

                    android:id="@android:id/title"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_alignParentTop="true"

                android:layout_toEndOf="@id/icon_mime_sm"

                    android:layout_alignParentStart="true"

                    android:singleLine="true"

                    android:ellipsize="end"

                    android:textAlignment="viewStart"
@@ -117,7 +128,6 @@ 
                    android:id="@+id/details"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                android:layout_toEndOf="@id/icon_mime_sm"

                    android:layout_below="@android:id/title"

                    android:layout_marginEnd="4dp"

                    android:singleLine="true"
@@ -137,9 +147,10 @@ 
                    android:textAlignment="viewStart"

                    android:textAppearance="@android:style/TextAppearance.Material.Caption"

                    android:textColor="@color/item_details" />



            </RelativeLayout>



        </LinearLayout>



        <!-- An overlay that draws the item border when it is focused. -->

        <View

            android:layout_width="wrap_content"

res/layout/item_doc_list.xml

+9 −7
Original line number Diff line number Diff line
@@ -29,16 +29,17 @@ 
        android:baselineAligned="false"

        android:gravity="center_vertical"

        android:minHeight="@dimen/list_item_height"

        android:orientation="horizontal"

        android:paddingEnd="@dimen/list_item_padding"

        android:paddingStart="@dimen/list_item_padding" >

        android:orientation="horizontal" >



        <FrameLayout

            android:id="@android:id/icon"

            android:pointerIcon="hand"

            android:layout_width="@dimen/list_item_thumbnail_size"

            android:layout_height="@dimen/list_item_thumbnail_size"

            android:layout_marginEnd="16dp" >

            android:layout_width="@dimen/list_item_width"

            android:layout_height="@dimen/list_item_height"

            android:paddingBottom="@dimen/list_item_icon_padding"

            android:paddingTop="@dimen/list_item_icon_padding"

            android:paddingEnd="16dp"

            android:paddingStart="@dimen/list_item_padding" >



            <ImageView

                android:id="@+id/icon_mime"
@@ -71,7 +72,8 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:orientation="vertical"

            android:layout_gravity="center_vertical" >

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="@dimen/list_item_padding" >



            <TextView

                android:id="@android:id/title"

res/values-sw720dp-land/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<resources>

    <dimen name="list_item_height">64dp</dimen>

    <dimen name="list_item_padding">24dp</dimen>

    <dimen name="list_item_icon_padding">12dp</dimen>



    <dimen name="list_divider_inset">80dp</dimen>