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

Commit 193743ad authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev am: 061db23b 

am: c0c57637

Change-Id: Ibe1167effdbe6ae39f10793691e2722900cd7af7
parents 0d801659 c0c57637

api/current.txt

+20 −0
Original line number Original line Diff line number Diff line
@@ -34506,6 +34506,9 @@ package android.provider { 
  }

  }

















  public class FontsContract {







  public class FontsContract {














    method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[], int, boolean, java.lang.String);














    method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[]);














    method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.graphics.fonts.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;











  }







  }



























  public static final class FontsContract.Columns implements android.provider.BaseColumns {







  public static final class FontsContract.Columns implements android.provider.BaseColumns {









@@ -34522,6 +34525,23 @@ package android.provider {









    field public static final java.lang.String WEIGHT = "font_weight";







    field public static final java.lang.String WEIGHT = "font_weight";











  }







  }






























  public static class FontsContract.FontFamilyResult {














    method public android.provider.FontsContract.FontInfo[] getFonts();














    method public int getStatusCode();














    field public static final int STATUS_OK = 0; // 0x0














    field public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2














    field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1














  }



























  public static class FontsContract.FontInfo {














    method public android.graphics.fonts.FontVariationAxis[] getAxes();














    method public int getResultCode();














    method public int getTtcIndex();














    method public android.net.Uri getUri();














    method public int getWeight();














    method public boolean isItalic();














  }
























  public final deprecated class LiveFolders implements android.provider.BaseColumns {







  public final deprecated class LiveFolders implements android.provider.BaseColumns {











    field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";







    field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";











    field public static final java.lang.String DESCRIPTION = "description";







    field public static final java.lang.String DESCRIPTION = "description";

























api/system-current.txt



+20
−0




























Original line number
Original line
Diff line number
Diff line








@@ -37483,6 +37483,9 @@ package android.provider {









  }







  }



























  public class FontsContract {







  public class FontsContract {














    method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[], int, boolean, java.lang.String);














    method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[]);














    method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.graphics.fonts.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;











  }







  }



























  public static final class FontsContract.Columns implements android.provider.BaseColumns {







  public static final class FontsContract.Columns implements android.provider.BaseColumns {









@@ -37499,6 +37502,23 @@ package android.provider {









    field public static final java.lang.String WEIGHT = "font_weight";







    field public static final java.lang.String WEIGHT = "font_weight";











  }







  }






























  public static class FontsContract.FontFamilyResult {














    method public android.provider.FontsContract.FontInfo[] getFonts();














    method public int getStatusCode();














    field public static final int STATUS_OK = 0; // 0x0














    field public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2














    field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1














  }



























  public static class FontsContract.FontInfo {














    method public android.graphics.fonts.FontVariationAxis[] getAxes();














    method public int getResultCode();














    method public int getTtcIndex();














    method public android.net.Uri getUri();














    method public int getWeight();














    method public boolean isItalic();














  }
























  public final deprecated class LiveFolders implements android.provider.BaseColumns {







  public final deprecated class LiveFolders implements android.provider.BaseColumns {











    field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";







    field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";











    field public static final java.lang.String DESCRIPTION = "description";







    field public static final java.lang.String DESCRIPTION = "description";

























api/test-current.txt



+20
−0




























Original line number
Original line
Diff line number
Diff line








@@ -34640,6 +34640,9 @@ package android.provider {









  }







  }



























  public class FontsContract {







  public class FontsContract {














    method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[], int, boolean, java.lang.String);














    method public static android.graphics.Typeface buildTypeface(android.content.Context, android.os.CancellationSignal, android.provider.FontsContract.FontInfo[]);














    method public static android.provider.FontsContract.FontFamilyResult fetchFonts(android.content.Context, android.os.CancellationSignal, android.graphics.fonts.FontRequest) throws android.content.pm.PackageManager.NameNotFoundException;











  }







  }



























  public static final class FontsContract.Columns implements android.provider.BaseColumns {







  public static final class FontsContract.Columns implements android.provider.BaseColumns {









@@ -34656,6 +34659,23 @@ package android.provider {









    field public static final java.lang.String WEIGHT = "font_weight";







    field public static final java.lang.String WEIGHT = "font_weight";











  }







  }






























  public static class FontsContract.FontFamilyResult {














    method public android.provider.FontsContract.FontInfo[] getFonts();














    method public int getStatusCode();














    field public static final int STATUS_OK = 0; // 0x0














    field public static final int STATUS_UNEXPECTED_DATA_PROVIDED = 2; // 0x2














    field public static final int STATUS_WRONG_CERTIFICATES = 1; // 0x1














  }



























  public static class FontsContract.FontInfo {














    method public android.graphics.fonts.FontVariationAxis[] getAxes();














    method public int getResultCode();














    method public int getTtcIndex();














    method public android.net.Uri getUri();














    method public int getWeight();














    method public boolean isItalic();














  }
























  public final deprecated class LiveFolders implements android.provider.BaseColumns {







  public final deprecated class LiveFolders implements android.provider.BaseColumns {











    field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";







    field public static final java.lang.String ACTION_CREATE_LIVE_FOLDER = "android.intent.action.CREATE_LIVE_FOLDER";











    field public static final java.lang.String DESCRIPTION = "description";







    field public static final java.lang.String DESCRIPTION = "description";

























core/java/android/provider/FontsContract.java



+367
−87


























File changed.
Preview size limit exceeded, changes collapsed.
























core/tests/coretests/src/android/provider/FontsContractTest.java



+167
−130


























File changed.
Preview size limit exceeded, changes collapsed.