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

Commit 9fb567b5 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Settings, replace files, sorting by size, tweaks. 

Add settings to show file sizes and advanced storage devices, both
disabled by default. Add sorting by size when enabled in settings.

Always show all documents, but only allow selection when they match
MIME filter. When creating, select entire filename on focus. When
creating, treat selected documents as replacement targets using that
exact Uri unless display name is changed.

Show available bytes for device roots. Show empty text label in
empty directories. Split grid backend and details into two separate
lines. Fix path label ordering when rendering recent directories.

Change-Id: I44c62e8adb8ca7d4355510a13d1ba975196a2d29
parent b156f4bf

core/java/android/provider/DocumentsContract.java

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ public final class DocumentsContract { 
     */

    public static final int FLAG_SUPPORTS_SEARCH = 1 << 4;



    // TODO: flag indicating that document is writable?



    /**

     * Optimal dimensions for a document thumbnail request, stored as a

     * {@link Point} object. This is only a hint, and the returned thumbnail may

packages/DocumentsUI/AndroidManifest.xml

+9 −1
Original line number Diff line number Diff line
@@ -7,11 +7,13 @@ 
        android:label="@string/app_label"

        android:supportsRtl="true">



        <!-- TODO: allow rotation when state saving is in better shape -->

        <activity

            android:name=".DocumentsActivity"

            android:finishOnCloseSystemDialogs="true"

            android:excludeFromRecents="true"

            android:theme="@android:style/Theme.Holo.Light">

            android:theme="@android:style/Theme.Holo.Light"

            android:screenOrientation="nosensor">

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.OPEN_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -24,6 +26,12 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".SettingsActivity"

            android:title="@string/menu_settings"

            android:theme="@android:style/Theme.Holo.Light"

            android:exported="false" />



        <provider

            android:name=".RecentsProvider"

            android:authorities="com.android.documentsui.recents"

packages/DocumentsUI/res/layout/fragment_directory.xml

+11 −1
Original line number Diff line number Diff line
@@ -18,6 +18,15 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <TextView

        android:id="@android:id/empty"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:gravity="center"

        android:text="@string/empty"

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

        android:visibility="gone" />



    <ListView

        android:id="@+id/list"

        android:layout_width="match_parent"
@@ -30,6 +39,7 @@ 
        android:layout_height="match_parent"

        android:listSelector="@android:color/transparent"

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

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

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

        android:visibility="gone" />



</FrameLayout>

packages/DocumentsUI/res/layout/fragment_save.xml

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ 
        android:layout_width="0dip"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:singleLine="true" />

        android:singleLine="true"

        android:selectAllOnFocus="true" />



    <Button

        android:id="@android:id/button1"

packages/DocumentsUI/res/layout/item_doc_grid.xml

+17 −3
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="160dip"

    android:layout_height="180dip"

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

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
@@ -30,6 +30,7 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingBottom="6dp"

            android:orientation="vertical">



            <ImageView
@@ -54,10 +55,10 @@ 
                android:textAlignment="viewStart" />



            <LinearLayout

                android:id="@+id/summary_grid"

                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">
@@ -75,12 +76,25 @@ 
                    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" />



            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

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

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



                <View

                    android:layout_width="0dip"

                    android:layout_height="0dip"

                    android:layout_weight="1" />



                <TextView

                    android:id="@+id/size"

                    android:layout_width="70dp"