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

Commit b156f4bf authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Recents in create, uniform item layouts. 

Show recent directories in a separate fragment, and save as serialized
versions of new DirectoryStack. Cleaner behavior around recents and
search, instead of treating them as pseudo-Documents.

More uniform item layouts between list and grid, including both date
and size information, and originating storage root in recents. Avoid
clashing directory loaders by assigning unique numbers. Promote
list/grid switching up into activity.

Change-Id: I9a93460b896067ca036d7e772eeabde31face2e1
parent 66516697

packages/DocumentsUI/AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ 


    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />



    <application android:label="@string/app_label">

    <application

        android:label="@string/app_label"

        android:supportsRtl="true">



        <activity

            android:name=".DocumentsActivity"

            android:finishOnCloseSystemDialogs="true"

packages/DocumentsUI/res/layout/fragment_roots.xml

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

    android:id="@android:id/list"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
    android:layout_height="match_parent"

    android:divider="@null" />

packages/DocumentsUI/res/layout/item_doc_grid.xml

+60 −9
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="140dip"

    android:layout_height="160dip"

    android:paddingBottom="?android:attr/listPreferredItemPaddingEnd"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
@@ -27,16 +27,16 @@ 
        android:foreground="@drawable/item_background"

        android:duplicateParentState="true">



        <GridLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:columnCount="1">

            android:orientation="vertical">



            <ImageView

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

                android:layout_width="match_parent"

                android:layout_height="0dip"

                android:layout_gravity="fill_vertical"

                android:layout_weight="1"

                android:background="#bbb"

                android:scaleType="centerInside"

                android:contentDescription="@null" />
@@ -44,16 +44,67 @@ 
            <TextView

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

                android:layout_width="match_parent"

                android:layout_marginStart="8dip"

                android:layout_marginEnd="8dip"

                android:layout_marginTop="8dip"

                android:layout_marginBottom="8dip"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:paddingTop="6dp"

                android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textAlignment="viewStart" />



        </GridLayout>

            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:paddingBottom="6dp"

                android:paddingStart="?android:attr/listPreferredItemPaddingStart"

                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



                <ImageView

                    android:id="@android:id/icon1"

                    android:layout_width="24dip"

                    android:layout_height="24dip"

                    android:layout_marginEnd="6dip"

                    android:scaleType="centerInside"

                    android:contentDescription="@null" />



                <TextView

                    android:id="@android:id/summary"

                    android:layout_width="0dp"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:layout_gravity="center_vertical"

                    android:layout_marginEnd="8dp"

                    android:singleLine="true"

                    android:ellipsize="marquee"

                    android:textAlignment="viewStart"

                    android:textAppearance="?android:attr/textAppearanceSmall" />



                <TextView

                    android:id="@+id/size"

                    android:layout_width="70dp"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center_vertical"

                    android:layout_marginEnd="8dp"

                    android:singleLine="true"

                    android:ellipsize="marquee"

                    android:textAlignment="viewEnd"

                    android:textAppearance="?android:attr/textAppearanceSmall" />



                <TextView

                    android:id="@+id/date"

                    android:layout_width="70dp"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center_vertical"

                    android:singleLine="true"

                    android:ellipsize="marquee"

                    android:textAlignment="viewEnd"

                    android:textAppearance="?android:attr/textAppearanceSmall" />



            </LinearLayout>



        </LinearLayout>



    </FrameLayout>

packages/DocumentsUI/res/layout/item_doc_list.xml

+67 −25
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/item_background"
@@ -23,40 +23,82 @@ 
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:columnCount="3">

    android:orientation="horizontal">



    <ImageView

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

        android:layout_width="@android:dimen/app_icon_size"

        android:layout_height="@android:dimen/app_icon_size"

        android:layout_rowSpan="2"

        android:layout_marginEnd="8dip"

        android:layout_gravity="center_vertical"

        android:scaleType="centerInside"

        android:contentDescription="@null" />



    <LinearLayout

        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="center_vertical"

        android:orientation="vertical">



        <TextView

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

        android:layout_width="0dip"

        android:layout_gravity="fill_horizontal"

        android:layout_marginTop="2dip"

        android:layout_columnSpan="2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textAlignment="viewStart" />



        <LinearLayout

            android:id="@+id/line2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal">



            <ImageView

                android:id="@android:id/icon1"

                android:layout_width="24dip"

                android:layout_height="24dip"

        android:layout_marginEnd="8dip"

        android:visibility="gone"

                android:layout_marginEnd="6dip"

                android:scaleType="centerInside"

                android:contentDescription="@null" />



            <TextView

                android:id="@android:id/summary"

        android:layout_marginTop="2dip"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="8dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />



</GridLayout>
 
            <TextView

                android:id="@+id/size"

                android:layout_width="70dp"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:layout_marginEnd="8dp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewEnd"

                android:textAppearance="?android:attr/textAppearanceSmall" />



            <TextView

                android:id="@+id/date"

                android:layout_width="70dp"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewEnd"

                android:textAppearance="?android:attr/textAppearanceSmall" />



        </LinearLayout>



    </LinearLayout>



</LinearLayout>

packages/DocumentsUI/res/menu/activity.xml

+10 −0
Original line number Diff line number Diff line
@@ -27,4 +27,14 @@ 
        android:showAsAction="always|collapseActionView"

        android:actionViewClass="android.widget.SearchView"

        android:imeOptions="actionSearch" />

    <item

        android:id="@+id/menu_grid"

        android:title="@string/menu_grid"

        android:icon="@drawable/ic_menu_grid"

        android:showAsAction="ifRoom" />

    <item

        android:id="@+id/menu_list"

        android:title="@string/menu_list"

        android:icon="@drawable/ic_menu_list"

        android:showAsAction="ifRoom" />

</menu>