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

Commit 97b35a70 authored Apr 05, 2017 by Seigo Nonaka Committed by android-build-merger Apr 05, 2017

Merge "Pass weight/italic pair instead of style." into oc-dev

am: b4e3b344

Change-Id: I9d430af9489878fd0c7eb8d26dce186a13059450

parents 505729c5 b4e3b344

api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -34519,14 +34519,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
		@@ -37456,14 +37456,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
		@@ -34659,14 +34659,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 {