diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index a006e5b..82eabc7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9713,6 +9713,8 @@ package android.graphics { method public void toggleInverseFillType(); method public void transform(android.graphics.Matrix, android.graphics.Path); method public void transform(android.graphics.Matrix); + method public void trim(float, float, float); + method public void trim(float, float, float, android.graphics.Path); } public static final class Path.Direction extends java.lang.Enum { @@ -14690,6 +14692,7 @@ package android.net.http { public class X509TrustManagerExtensions { ctor public X509TrustManagerExtensions(javax.net.ssl.X509TrustManager) throws java.lang.IllegalArgumentException; method public java.util.List<java.security.cert.X509Certificate> checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.lang.String) throws java.security.cert.CertificateException; + method public boolean isUserAddedCertificate(java.security.cert.X509Certificate); } } @@ -15541,6 +15544,11 @@ package android.nfc { method public android.nfc.NfcAdapter getDefaultAdapter(); } + public class NfcUnlock { + method public static synchronized android.nfc.NfcUnlock getInstance(android.nfc.NfcAdapter); + method public boolean getNfcUnlockEnabled(); + } + public final class Tag implements android.os.Parcelable { method public int describeContents(); method public byte[] getId(); @@ -20067,16 +20075,24 @@ package android.provider { public static class CallLog.Calls implements android.provider.BaseColumns { ctor public CallLog.Calls(); method public static java.lang.String getLastOutgoingCall(android.content.Context); + field public static final java.lang.String CACHED_FORMATTED_NUMBER = "formatted_number"; + field public static final java.lang.String CACHED_LOOKUP_URI = "lookup_uri"; + field public static final java.lang.String CACHED_MATCHED_NUMBER = "matched_number"; field public static final java.lang.String CACHED_NAME = "name"; + field public static final java.lang.String CACHED_NORMALIZED_NUMBER = "normalized_number"; field public static final java.lang.String CACHED_NUMBER_LABEL = "numberlabel"; field public static final java.lang.String CACHED_NUMBER_TYPE = "numbertype"; + field public static final java.lang.String CACHED_PHOTO_ID = "photo_id"; field public static final android.net.Uri CONTENT_FILTER_URI; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/calls"; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/calls"; field public static final android.net.Uri CONTENT_URI; + field public static final android.net.Uri CONTENT_URI_WITH_VOICEMAIL; + field public static final java.lang.String COUNTRY_ISO = "countryiso"; field public static final java.lang.String DATE = "date"; field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC"; field public static final java.lang.String DURATION = "duration"; + field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location"; field public static final int INCOMING_TYPE = 1; // 0x1 field public static final java.lang.String IS_READ = "is_read"; field public static final java.lang.String LIMIT_PARAM_KEY = "limit"; @@ -20091,6 +20107,8 @@ package android.provider { field public static final int PRESENTATION_RESTRICTED = 2; // 0x2 field public static final int PRESENTATION_UNKNOWN = 3; // 0x3 field public static final java.lang.String TYPE = "type"; + field public static final int VOICEMAIL_TYPE = 4; // 0x4 + field public static final java.lang.String VOICEMAIL_URI = "voicemail_uri"; } public deprecated class Contacts { @@ -20397,6 +20415,8 @@ package android.provider { field public static final java.lang.String LIMIT_PARAM_KEY = "limit"; field public static final java.lang.String PRIMARY_ACCOUNT_NAME = "name_for_primary_account"; field public static final java.lang.String PRIMARY_ACCOUNT_TYPE = "type_for_primary_account"; + field public static final java.lang.String REMOVE_DUPLICATE_ENTRIES = "remove_duplicate_entries"; + field public static final java.lang.String STREQUENT_PHONE_ONLY = "strequent_phone_only"; } public static final class ContactsContract.AggregationExceptions implements android.provider.BaseColumns { @@ -20425,6 +20445,12 @@ package android.provider { field public static final int TYPE_CUSTOM = 0; // 0x0 } + public static final class ContactsContract.CommonDataKinds.Callable implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins { + ctor public ContactsContract.CommonDataKinds.Callable(); + field public static final android.net.Uri CONTENT_FILTER_URI; + field public static final android.net.Uri CONTENT_URI; + } + protected static abstract interface ContactsContract.CommonDataKinds.CommonColumns implements android.provider.ContactsContract.CommonDataKinds.BaseTypes { field public static final java.lang.String DATA = "data1"; field public static final java.lang.String LABEL = "data3"; @@ -20603,6 +20629,7 @@ package android.provider { field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/name"; field public static final java.lang.String DISPLAY_NAME = "data1"; field public static final java.lang.String FAMILY_NAME = "data3"; + field public static final java.lang.String FULL_NAME_STYLE = "data10"; field public static final java.lang.String GIVEN_NAME = "data2"; field public static final java.lang.String MIDDLE_NAME = "data5"; field public static final java.lang.String PHONETIC_FAMILY_NAME = "data9"; @@ -20656,6 +20683,7 @@ package android.provider { protected static abstract interface ContactsContract.ContactOptionsColumns { field public static final java.lang.String CUSTOM_RINGTONE = "custom_ringtone"; field public static final java.lang.String LAST_TIME_CONTACTED = "last_time_contacted"; + field public static final java.lang.String PINNED = "pinned"; field public static final java.lang.String SEND_TO_VOICEMAIL = "send_to_voicemail"; field public static final java.lang.String STARRED = "starred"; field public static final java.lang.String TIMES_CONTACTED = "times_contacted"; @@ -20682,6 +20710,7 @@ package android.provider { field public static final android.net.Uri CONTENT_GROUP_URI; field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact"; field public static final android.net.Uri CONTENT_LOOKUP_URI; + field public static final android.net.Uri CONTENT_MULTI_VCARD_URI; field public static final android.net.Uri CONTENT_STREQUENT_FILTER_URI; field public static final android.net.Uri CONTENT_STREQUENT_URI; field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/contact"; @@ -20914,6 +20943,7 @@ package android.provider { public static final class ContactsContract.PhoneLookup implements android.provider.BaseColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.PhoneLookupColumns { field public static final android.net.Uri CONTENT_FILTER_URI; + field public static final java.lang.String QUERY_PARAMETER_SIP_ADDRESS = "sip"; } protected static abstract interface ContactsContract.PhoneLookupColumns { @@ -20930,6 +20960,25 @@ package android.provider { field public static final int UNDEFINED = 0; // 0x0 } + public static final class ContactsContract.PinnedPositions { + ctor public ContactsContract.PinnedPositions(); + field public static final int DEMOTED = -1; // 0xffffffff + field public static final java.lang.String STAR_WHEN_PINNING = "star_when_pinning"; + field public static final java.lang.String UNDEMOTE = "undemote"; + field public static final int UNPINNED = 2147483647; // 0x7fffffff + field public static final android.net.Uri UPDATE_URI; + } + + public static final class ContactsContract.Preferences { + ctor public ContactsContract.Preferences(); + field public static final java.lang.String DISPLAY_ORDER = "android.contacts.DISPLAY_ORDER"; + field public static final int DISPLAY_ORDER_ALTERNATIVE = 2; // 0x2 + field public static final int DISPLAY_ORDER_PRIMARY = 1; // 0x1 + field public static final java.lang.String SORT_ORDER = "android.contacts.SORT_ORDER"; + field public static final int SORT_ORDER_ALTERNATIVE = 2; // 0x2 + field public static final int SORT_ORDER_PRIMARY = 1; // 0x1 + } + public static final deprecated class ContactsContract.Presence extends android.provider.ContactsContract.StatusUpdates { ctor public ContactsContract.Presence(); } @@ -21697,6 +21746,7 @@ package android.provider { field public static final java.lang.String LOCK_PATTERN_VISIBLE = "lock_pattern_visible_pattern"; field public static final deprecated java.lang.String LOGGING_ID = "logging_id"; field public static final deprecated java.lang.String NETWORK_PREFERENCE = "network_preference"; + field public static final java.lang.String NFC_UNLOCK_ENABLED = "nfc_unlock_enabled"; field public static final java.lang.String PARENTAL_CONTROL_ENABLED = "parental_control_enabled"; field public static final java.lang.String PARENTAL_CONTROL_LAST_UPDATE = "parental_control_last_update"; field public static final java.lang.String PARENTAL_CONTROL_REDIRECT_URL = "parental_control_redirect_url"; @@ -29920,6 +29970,7 @@ package android.view.accessibility { field public final int edgeColor; field public final int edgeType; field public final int foregroundColor; + field public final int windowColor; } public static abstract class CaptioningManager.CaptioningChangeListener { |