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

Commit 871b0579 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Folder to mime types, don't display null data" into arc-apps

parents 9e574066 98e2d8da

res/values/mimes.xml

+2 −0
Original line number Diff line number Diff line
@@ -64,4 +64,6 @@ 
    <string name="gmap_file_type">Google map</string>

    <!-- Google site file type shown in type column in list view. [CHAR LIMIT=24] -->

    <string name="gsite_file_type">Google site</string>

    <!-- Generic directory type shown when viewing a folder in the properties view -->

    <string name="directory_type">Folder</string>

</resources>
 
 No newline at end of file

src/com/android/documentsui/FileTypeMap.java

+3 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ public class FileTypeMap implements Lookup<String, String> { 
        mFileTypeMap.put("application/vnd.google-apps.map", R.string.gmap_file_type);

        mFileTypeMap.put("application/vnd.google-apps.sites", R.string.gsite_file_type);



        // Directory type

        mFileTypeMap.put("vnd.android.document/directory", R.string.directory_type);



        // Archive types

        mArchiveTypeMap.put("application/rar", "RAR");

        mArchiveTypeMap.put("application/zip", "Zip");

src/com/android/documentsui/inspector/DetailsView.java

+7 −4
Original line number Diff line number Diff line
@@ -66,10 +66,13 @@ public class DetailsView extends TableView implements Consumer<DocumentInfo> { 
        final Lookup<String, String> fileTypeLookup

                = DocumentsApplication.getFileTypeLookup(getContext());

        setRow(R.string.sort_dimension_file_type, fileTypeLookup.lookup(info.mimeType));

        if (info.size > 0) {

            setRow(R.string.sort_dimension_size, Formatter.formatFileSize(getContext(), info.size));

        }

        if (info.lastModified > 0) {

            setRow(R.string.sort_dimension_date,

                    DateFormat.getDateFormat(getContext()).format(info.lastModified));



        }

        if(info.numberOfChildren != -1) {

            setRow(R.string.directory_children, String.valueOf(info.numberOfChildren));

        }