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

Commit 7e258b31 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

XML metadata for storage backend; custom icons. 

Introduce XML metadata for storage backends, used to indicate if
custom roots should be queried, and provide any custom MIME type
icons inside that backend.

Parse metadata and resolve custom icons in UI.

Change-Id: Iec026c0b10845edff7a345d9389691ddf2c87a0e
parent 3d38fa30

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ package android { 
    field public static final int cropToPadding = 16843043; // 0x1010123

    field public static final int cursorVisible = 16843090; // 0x1010152

    field public static final int customNavigationLayout = 16843474; // 0x10102d2

    field public static final int customRoots = 16843751; // 0x10103e7

    field public static final int customTokens = 16843579; // 0x101033b

    field public static final int cycles = 16843220; // 0x10101d4

    field public static final int dashGap = 16843175; // 0x10101a7
@@ -7624,7 +7625,7 @@ package android.content.res { 
    method public void recycle();

  }













  public abstract interface XmlResourceParser implements android.util.AttributeSet org.xmlpull.v1.XmlPullParser {













  public abstract interface XmlResourceParser implements android.util.AttributeSet java.lang.AutoCloseable org.xmlpull.v1.XmlPullParser {















    method public abstract void close();















  }







































core/java/android/content/res/XmlResourceParser.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -26,7 +26,7 @@ import android.util.AttributeSet;













 * an additional close() method on this interface for the client to indicate















 * when it is done reading the resource.















 */













public interface XmlResourceParser extends XmlPullParser, AttributeSet {













public interface XmlResourceParser extends XmlPullParser, AttributeSet, AutoCloseable {















    /**















     * Close this interface to the resource.  Calls on the interface are no















     * longer value after this call.

































core/res/res/values/attrs.xml



+5
−0




























Original line number
Diff line number
Diff line








@@ -6007,4 +6007,9 @@













        <attr name="digit" format="integer" />















        <attr name="textView" format="reference" />















    </declare-styleable>



























    <declare-styleable name="DocumentsProviderInfo">













        <attr name="customRoots" format="boolean" />













    </declare-styleable>





























</resources>
























core/res/res/values/public.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -2070,4 +2070,5 @@













  <public type="attr" name="vendor" />















  <public type="attr" name="category" />















  <public type="attr" name="isAsciiCapable" />













  <public type="attr" name="customRoots" />















</resources>
























packages/DocumentsUI/res/values/strings.xml



+4
−2




























Original line number
Diff line number
Diff line








@@ -34,7 +34,9 @@













    <string name="sort_name">By name</string>















    <string name="sort_date">By date modified</string>





























    <string name="drawer_open">Open navigation drawer</string>













    <string name="drawer_close">Close navigation drawer</string>













    <string name="drawer_open">Show roots</string>













    <string name="drawer_close">Hide roots</string>



























    <string name="save_error">Failed to save document</string>































</resources>