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

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

Merge "Update Documents chip"

parents e8610792 ea6ad746

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -443,8 +443,8 @@ 
    <string name="chip_title_audio">Audio</string>

    <!-- Title for videos chip. [CHAR_LIMIT=25] -->

    <string name="chip_title_videos">Videos</string>

    <!-- Title for image chip. [CHAR_LIMIT=40] -->

    <string name="chip_title_documents">Document &amp; Other</string>

    <!-- Title for image chip. [CHAR_LIMIT=25] -->

    <string name="chip_title_documents">Documents</string>

    <!-- Title for large file chip. [CHAR_LIMIT=25] -->

    <string name="chip_title_large_files">Large files</string>

    <!-- Title for from this week chip. [CHAR_LIMIT=25] -->

src/com/android/documentsui/base/MimeTypes.java

+1 −12
Original line number Diff line number Diff line
@@ -39,12 +39,9 @@ public final class MimeTypes { 


    static {

        sDocumentsMimeTypes.add("application/epub+zip");

        sDocumentsMimeTypes.add("application/javascript");

        sDocumentsMimeTypes.add("application/msword");

        sDocumentsMimeTypes.add("application/pdf");

        sDocumentsMimeTypes.add("application/rar");

        sDocumentsMimeTypes.add("application/rtf");

        sDocumentsMimeTypes.add("application/vnd.android.package-archive");

        sDocumentsMimeTypes.add("application/vnd.ms-excel");

        sDocumentsMimeTypes.add("application/vnd.ms-excel.addin.macroEnabled.12");

        sDocumentsMimeTypes.add("application/vnd.ms-excel.sheet.binary.macroEnabled.12");
@@ -104,15 +101,7 @@ public final class MimeTypes { 
        sDocumentsMimeTypes.add("application/vnd.sun.xml.writer.global");

        sDocumentsMimeTypes.add("application/vnd.sun.xml.writer.template");

        sDocumentsMimeTypes.add("application/x-mspublisher");

        sDocumentsMimeTypes.add("application/xml");

        sDocumentsMimeTypes.add("application/zip");

        sDocumentsMimeTypes.add("text/calendar");

        sDocumentsMimeTypes.add("text/css");

        sDocumentsMimeTypes.add("text/csv");

        sDocumentsMimeTypes.add("text/html");

        sDocumentsMimeTypes.add("text/plain");

        sDocumentsMimeTypes.add("text/tab-separated-values");

        sDocumentsMimeTypes.add("text/vcard");

        sDocumentsMimeTypes.add("text/*");

    }



    /**