Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Typeface callback docs about error codes" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-21 09:44:48 +00:00
committed by Android (Google) Code Review
parent 4b76d33968 5706a1b12d
commit 337be5a12f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/FontsContract.java
View File

@@ -128,8 +128,9 @@ public class FontsContract {
* should have this column populated to indicate the result status of the
* query. This will be checked before any other data in the cursor. Possible values are
* {@link #RESULT_CODE_OK}, {@link #RESULT_CODE_FONT_NOT_FOUND},
* {@link #RESULT_CODE_MALFORMED_QUERY} and {@link #RESULT_CODE_FONT_UNAVAILABLE}. If not
* present, {@link #RESULT_CODE_OK} will be assumed.
* {@link #RESULT_CODE_MALFORMED_QUERY} and {@link #RESULT_CODE_FONT_UNAVAILABLE} for system
* defined values. You may also define your own values in the 0x000010000..0xFFFF0000 range.
* If not present, {@link #RESULT_CODE_OK} will be assumed.
*/
public static final String RESULT_CODE = "result_code";
@@ -462,7 +463,10 @@ public class FontsContract {
* {@link #FAIL_REASON_FONT_NOT_FOUND},
* {@link #FAIL_REASON_FONT_LOAD_ERROR},
* {@link #FAIL_REASON_FONT_UNAVAILABLE} or
* {@link #FAIL_REASON_MALFORMED_QUERY}.
* {@link #FAIL_REASON_MALFORMED_QUERY} if returned by the system. May also be
* a positive value greater than 0 defined by the font provider as an
* additional error code. Refer to the provider's documentation for more
* information on possible returned error codes.
*/
public void onTypefaceRequestFailed(@FontRequestFailReason int reason) {}
}

7
graphics/java/android/graphics/Typeface.java
View File

@@ -475,11 +475,14 @@ public class Typeface {
/**
* Called when a Typeface request done via {@link Typeface#create(FontRequest,
* FontRequestCallback)} fails.
* @param reason One of {@link #FAIL_REASON_PROVIDER_NOT_FOUND},
* @param reason May be one of {@link #FAIL_REASON_PROVIDER_NOT_FOUND},
* {@link #FAIL_REASON_FONT_NOT_FOUND},
* {@link #FAIL_REASON_FONT_LOAD_ERROR},
* {@link #FAIL_REASON_FONT_UNAVAILABLE} or
* {@link #FAIL_REASON_MALFORMED_QUERY}.
* {@link #FAIL_REASON_MALFORMED_QUERY} if returned by the system. May also be
* a positive value greater than 0 defined by the font provider as an
* additional error code. Refer to the provider's documentation for more
* information on possible returned error codes.
*/
void onTypefaceRequestFailed(@FontRequestFailReason int reason);
}