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

Commit fe04aa84 authored Apr 01, 2017 by Seigo Nonaka

Pass weight/italic pair instead of style.

Typeface.NORMAL/BOLD/ITALIC/ITALIC_BOLD is used for specifying relative
from current Typeface. For example

  Typeface face = Typeface.create("serif");
  Typeface thickerFace = Typeface.create(face, Typeface.BOLD);
  Typeface moreThickerFace = Typeface.create(tickerFace, Typface.BOLD);

For the purpose of providing font information, we should use weight/italic
value instead of style in Typeface.
The Columns.STYLE field was kept for preventing runtime crash of demo
apps.

Test: Manually
Change-Id: I732e8ee04a66f61321fc0a98dbfb8fdc0a4dd7a4

parent 2ac96982

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -34410,14 +34410,15 @@ package android.provider {

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		ctor public FontsContract.Columns();
		field public static final java.lang.String ITALIC = "font_italic";
		field public static final java.lang.String RESULT_CODE = "result_code";
		field public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field public static final int RESULT_CODE_OK = 0; // 0x0
		field public static final java.lang.String STYLE = "font_style";
		field public static final java.lang.String TTC_INDEX = "font_ttc_index";
		field public static final java.lang.String VARIATION_SETTINGS = "font_variation_settings";
		field public static final java.lang.String WEIGHT = "font_weight";
		}

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

api/removed.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,10 @@ package android.provider {
		field public static final deprecated java.lang.String TIMESTAMP = "timestamp";
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		field public static final java.lang.String STYLE = "font_style";
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		field public static final deprecated java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";
		}

api/system-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -37319,14 +37319,15 @@ package android.provider {

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		ctor public FontsContract.Columns();
		field public static final java.lang.String ITALIC = "font_italic";
		field public static final java.lang.String RESULT_CODE = "result_code";
		field public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field public static final int RESULT_CODE_OK = 0; // 0x0
		field public static final java.lang.String STYLE = "font_style";
		field public static final java.lang.String TTC_INDEX = "font_ttc_index";
		field public static final java.lang.String VARIATION_SETTINGS = "font_variation_settings";
		field public static final java.lang.String WEIGHT = "font_weight";
		}

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

api/system-removed.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,10 @@ package android.provider {
		field public static final deprecated java.lang.String TIMESTAMP = "timestamp";
		}

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		field public static final java.lang.String STYLE = "font_style";
		}

		public static final class Settings.Global extends android.provider.Settings.NameValueTable {
		field public static final deprecated java.lang.String CONTACT_METADATA_SYNC = "contact_metadata_sync";
		}

api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -34550,14 +34550,15 @@ package android.provider {

		public static final class FontsContract.Columns implements android.provider.BaseColumns {
		ctor public FontsContract.Columns();
		field public static final java.lang.String ITALIC = "font_italic";
		field public static final java.lang.String RESULT_CODE = "result_code";
		field public static final int RESULT_CODE_FONT_NOT_FOUND = 1; // 0x1
		field public static final int RESULT_CODE_FONT_UNAVAILABLE = 2; // 0x2
		field public static final int RESULT_CODE_MALFORMED_QUERY = 3; // 0x3
		field public static final int RESULT_CODE_OK = 0; // 0x0
		field public static final java.lang.String STYLE = "font_style";
		field public static final java.lang.String TTC_INDEX = "font_ttc_index";
		field public static final java.lang.String VARIATION_SETTINGS = "font_variation_settings";
		field public static final java.lang.String WEIGHT = "font_weight";
		}

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