summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt43
1 files changed, 24 insertions, 19 deletions
diff --git a/api/current.txt b/api/current.txt
index 8236f38..6fbb5ce 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -309,7 +309,6 @@ package android {
field public static final int addStatesFromChildren = 16842992; // 0x10100f0
field public static final int adjustViewBounds = 16843038; // 0x101011e
field public static final int advancedPrintOptionsActivity = 16843761; // 0x10103f1
- field public static final int ageHint = 16843962; // 0x10104ba
field public static final int alertDialogIcon = 16843605; // 0x1010355
field public static final int alertDialogStyle = 16842845; // 0x101005d
field public static final int alertDialogTheme = 16843529; // 0x1010309
@@ -459,6 +458,7 @@ package android {
field public static final int configure = 16843357; // 0x101025d
field public static final int constantSize = 16843158; // 0x1010196
field public static final int content = 16843355; // 0x101025b
+ field public static final int contentAgeHint = 16843962; // 0x10104ba
field public static final int contentAuthority = 16843408; // 0x1010290
field public static final int contentDescription = 16843379; // 0x1010273
field public static final int contentInsetEnd = 16843860; // 0x1010454
@@ -1360,7 +1360,6 @@ package android {
field public static final int trimPathEnd = 16843811; // 0x1010423
field public static final int trimPathOffset = 16843812; // 0x1010424
field public static final int trimPathStart = 16843810; // 0x1010422
- field public static final int tvContentRatingDescription = 16843955; // 0x10104b3
field public static final int type = 16843169; // 0x10101a1
field public static final int typeface = 16842902; // 0x1010096
field public static final int uiOptions = 16843672; // 0x1010398
@@ -2166,18 +2165,22 @@ package android {
field public static final int Theme_Material_Dialog = 16974386; // 0x1030232
field public static final int Theme_Material_DialogWhenLarge = 16974390; // 0x1030236
field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974391; // 0x1030237
+ field public static final int Theme_Material_Dialog_Alert = 16974570; // 0x10302ea
field public static final int Theme_Material_Dialog_MinWidth = 16974387; // 0x1030233
field public static final int Theme_Material_Dialog_NoActionBar = 16974388; // 0x1030234
field public static final int Theme_Material_Dialog_NoActionBar_MinWidth = 16974389; // 0x1030235
+ field public static final int Theme_Material_Dialog_Presentation = 16974571; // 0x10302eb
field public static final int Theme_Material_InputMethod = 16974392; // 0x1030238
field public static final int Theme_Material_Light = 16974402; // 0x1030242
field public static final int Theme_Material_Light_DarkActionBar = 16974403; // 0x1030243
field public static final int Theme_Material_Light_Dialog = 16974404; // 0x1030244
field public static final int Theme_Material_Light_DialogWhenLarge = 16974408; // 0x1030248
field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974409; // 0x1030249
+ field public static final int Theme_Material_Light_Dialog_Alert = 16974572; // 0x10302ec
field public static final int Theme_Material_Light_Dialog_MinWidth = 16974405; // 0x1030245
field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974406; // 0x1030246
field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974407; // 0x1030247
+ field public static final int Theme_Material_Light_Dialog_Presentation = 16974573; // 0x10302ed
field public static final int Theme_Material_Light_NoActionBar = 16974410; // 0x103024a
field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974411; // 0x103024b
field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974412; // 0x103024c
@@ -2566,7 +2569,7 @@ package android {
field public static final int Widget_Material_Light_SeekBar = 16974534; // 0x10302c6
field public static final int Widget_Material_Light_SegmentedButton = 16974535; // 0x10302c7
field public static final int Widget_Material_Light_Spinner = 16974537; // 0x10302c9
- field public static final int Widget_Material_Light_Spinner_Form = 16974567; // 0x10302e7
+ field public static final int Widget_Material_Light_Spinner_Underlined = 16974567; // 0x10302e7
field public static final int Widget_Material_Light_StackView = 16974536; // 0x10302c8
field public static final int Widget_Material_Light_Tab = 16974538; // 0x10302ca
field public static final int Widget_Material_Light_TabWidget = 16974539; // 0x10302cb
@@ -2593,7 +2596,7 @@ package android {
field public static final int Widget_Material_SeekBar = 16974471; // 0x1030287
field public static final int Widget_Material_SegmentedButton = 16974472; // 0x1030288
field public static final int Widget_Material_Spinner = 16974474; // 0x103028a
- field public static final int Widget_Material_Spinner_Form = 16974566; // 0x10302e6
+ field public static final int Widget_Material_Spinner_Underlined = 16974566; // 0x10302e6
field public static final int Widget_Material_StackView = 16974473; // 0x1030289
field public static final int Widget_Material_Tab = 16974475; // 0x103028b
field public static final int Widget_Material_TabWidget = 16974476; // 0x103028c
@@ -4506,8 +4509,8 @@ package android.app {
}
public class KeyguardManager {
+ method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
- method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
method public boolean inKeyguardRestrictedInputMode();
method public boolean isKeyguardLocked();
method public boolean isKeyguardSecure();
@@ -5424,6 +5427,7 @@ package android.app.admin {
method public java.lang.String[] getAccountTypesWithManagementDisabled();
method public java.util.List<android.content.ComponentName> getActiveAdmins();
method public android.os.Bundle getApplicationRestrictions(android.content.ComponentName, java.lang.String);
+ method public boolean getAutoTimeRequired();
method public boolean getCameraDisabled(android.content.ComponentName);
method public boolean getCrossProfileCallerIdDisabled(android.content.ComponentName);
method public java.util.List<java.lang.String> getCrossProfileWidgetProviders(android.content.ComponentName);
@@ -5449,8 +5453,6 @@ package android.app.admin {
method public boolean getScreenCaptureDisabled(android.content.ComponentName);
method public boolean getStorageEncryption(android.content.ComponentName);
method public int getStorageEncryptionStatus();
- method public java.util.List<java.lang.String> getTrustAgentFeaturesEnabled(android.content.ComponentName, android.content.ComponentName);
- method public boolean getUninstallBlocked(android.content.ComponentName, java.lang.String);
method public boolean hasCaCertInstalled(byte[]);
method public boolean hasGrantedPolicy(android.content.ComponentName, int);
method public boolean installCaCert(android.content.ComponentName, byte[]);
@@ -5461,6 +5463,7 @@ package android.app.admin {
method public boolean isLockTaskPermitted(java.lang.String);
method public boolean isMasterVolumeMuted(android.content.ComponentName);
method public boolean isProfileOwnerApp(java.lang.String);
+ method public boolean isUninstallBlocked(android.content.ComponentName, java.lang.String);
method public void lockNow();
method public void removeActiveAdmin(android.content.ComponentName);
method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String);
@@ -5469,6 +5472,7 @@ package android.app.admin {
method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean);
method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean);
method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle);
+ method public void setAutoTimeRequired(android.content.ComponentName, boolean);
method public void setCameraDisabled(android.content.ComponentName, boolean);
method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean);
method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String);
@@ -5496,7 +5500,6 @@ package android.app.admin {
method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);
method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);
method public int setStorageEncryption(android.content.ComponentName, boolean);
- method public void setTrustAgentFeaturesEnabled(android.content.ComponentName, android.content.ComponentName, java.util.List<java.lang.String>);
method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);
method public boolean switchUser(android.content.ComponentName, android.os.UserHandle);
method public void uninstallAllUserCaCerts(android.content.ComponentName);
@@ -8890,6 +8893,7 @@ package android.content.pm {
field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen";
field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods";
field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback";
+ field public static final java.lang.String FEATURE_LIVE_TV = "android.software.live_tv";
field public static final java.lang.String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";
field public static final java.lang.String FEATURE_LOCATION = "android.hardware.location";
field public static final java.lang.String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
@@ -16776,11 +16780,13 @@ package android.media.tv {
method public boolean isRatingBlocked(android.media.tv.TvContentRating);
method public void registerListener(android.media.tv.TvInputManager.TvInputListener, android.os.Handler);
method public void unregisterListener(android.media.tv.TvInputManager.TvInputListener);
- field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED";
- field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";
+ field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.TvInputManager.ACTION_BLOCKED_RATINGS_CHANGED";
+ field public static final java.lang.String ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.TvInputManager.ACTION_PARENTAL_CONTROLS_ENABLED_CHANGED";
+ field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.TvInputManager.ACTION_QUERY_CONTENT_RATING_SYSTEMS";
field public static final int INPUT_STATE_CONNECTED = 0; // 0x0
field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
+ field public static final java.lang.String META_DATA_CONTENT_RATING_SYSTEMS = "android.media.tv.TvInputManager.META_DATA_CONTENT_RATING_SYSTEMS";
field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1
field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0
@@ -22299,7 +22305,7 @@ package android.os {
field public static final int PROXIMITY_SCREEN_OFF_WAKE_LOCK = 32; // 0x20
field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa
field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6
- field public static final int WAIT_FOR_PROXIMITY_NEGATIVE = 1; // 0x1
+ field public static final int WAIT_FOR_DISTANT_PROXIMITY = 1; // 0x1
}
public final class PowerManager.WakeLock {
@@ -23731,7 +23737,7 @@ package android.provider {
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 EXTRA_CALL_TYPE_FILTER = "extra_call_type_filter";
+ field public static final java.lang.String EXTRA_CALL_TYPE_FILTER = "android.provider.extra.call_type_filter";
field public static final java.lang.String FEATURES = "features";
field public static final int FEATURES_NONE = 0; // 0x0
field public static final int FEATURES_VIDEO = 1; // 0x1
@@ -24402,7 +24408,7 @@ package android.provider {
public static class ContactsContract.Contacts implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns {
method public static android.net.Uri getLookupUri(android.content.ContentResolver, android.net.Uri);
method public static android.net.Uri getLookupUri(long, java.lang.String);
- method public static boolean isCorpContactId(long);
+ method public static boolean isEnterpriseContactId(long);
method public static android.net.Uri lookupContact(android.content.ContentResolver, android.net.Uri);
method public static deprecated void markAsContacted(android.content.ContentResolver, long);
method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri, boolean);
@@ -24715,7 +24721,7 @@ package android.provider {
method public static void showQuickContact(android.content.Context, android.view.View, android.net.Uri, int, java.lang.String[]);
method public static void showQuickContact(android.content.Context, android.graphics.Rect, android.net.Uri, int, java.lang.String[]);
field public static final java.lang.String ACTION_QUICK_CONTACT = "com.android.contacts.action.QUICK_CONTACT";
- field public static final java.lang.String EXTRA_EXCLUDE_MIMES = "exclude_mimes";
+ field public static final java.lang.String EXTRA_EXCLUDE_MIMES = "android.provider.extra.EXCLUDE_MIMES";
field public static final int MODE_LARGE = 3; // 0x3
field public static final int MODE_MEDIUM = 2; // 0x2
field public static final int MODE_SMALL = 1; // 0x1
@@ -36568,15 +36574,14 @@ package android.webkit {
public static abstract class WebChromeClient.FileChooserParams {
ctor public WebChromeClient.FileChooserParams();
method public abstract java.lang.String[] getAcceptTypes();
- method public abstract java.lang.String getDefaultFilename();
+ method public abstract java.lang.String getFilenameHint();
method public abstract int getMode();
method public abstract java.lang.CharSequence getTitle();
method public abstract android.webkit.WebChromeClient.UploadHelper getUploadHelper();
method public abstract boolean isCaptureEnabled();
- field public static final int OPEN = 0; // 0x0
- field public static final int OPEN_FOLDER = 2; // 0x2
- field public static final int OPEN_MULTIPLE = 1; // 0x1
- field public static final int SAVE = 3; // 0x3
+ field public static final int MODE_OPEN = 0; // 0x0
+ field public static final int MODE_OPEN_MULTIPLE = 1; // 0x1
+ field public static final int MODE_SAVE = 3; // 0x3
}
public static abstract class WebChromeClient.UploadHelper {