diff options
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 135 |
1 files changed, 122 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index 9bd6367..fcbfa04 100644 --- a/api/current.txt +++ b/api/current.txt @@ -525,6 +525,7 @@ package android { field public static final int dropDownWidth = 16843362; // 0x1010262 field public static final int duplicateParentState = 16842985; // 0x10100e9 field public static final int duration = 16843160; // 0x1010198 + field public static final int durationScaleHint = 16844014; // 0x10104ee field public static final int editTextBackground = 16843602; // 0x1010352 field public static final int editTextColor = 16843601; // 0x1010351 field public static final int editTextPreferenceStyle = 16842898; // 0x1010092 @@ -1301,6 +1302,7 @@ package android { field public static final int thicknessRatio = 16843164; // 0x101019c field public static final int thumb = 16843074; // 0x1010142 field public static final int thumbOffset = 16843075; // 0x1010143 + field public static final int thumbPosition = 16844013; // 0x10104ed field public static final int thumbTextPadding = 16843634; // 0x1010372 field public static final int thumbTint = 16843889; // 0x1010471 field public static final int thumbTintMode = 16843890; // 0x1010472 @@ -2878,6 +2880,7 @@ package android.animation { method public void cancel(); method public android.animation.Animator clone(); method public void end(); + method public long getDistanceBasedDuration(); method public abstract long getDuration(); method public android.animation.TimeInterpolator getInterpolator(); method public java.util.ArrayList<android.animation.Animator.AnimatorListener> getListeners(); @@ -2891,12 +2894,16 @@ package android.animation { method public void removePauseListener(android.animation.Animator.AnimatorPauseListener); method public void resume(); method public abstract android.animation.Animator setDuration(long); + method public void setDurationScaleHint(int, android.content.res.Resources); method public abstract void setInterpolator(android.animation.TimeInterpolator); method public abstract void setStartDelay(long); method public void setTarget(java.lang.Object); method public void setupEndValues(); method public void setupStartValues(); method public void start(); + field public static final int HINT_DISTANCE_DEFINED_IN_DP = 2; // 0x2 + field public static final int HINT_DISTANCE_PROPORTIONAL_TO_SCREEN_SIZE = 1; // 0x1 + field public static final int HINT_NO_SCALE = 0; // 0x0 } public static abstract interface Animator.AnimatorListener { @@ -3975,6 +3982,48 @@ package android.app { field public java.lang.String serviceDetails; } + public final class AssistAction { + method public static void updateAssistData(android.os.Bundle, android.os.Bundle); + field public static final java.lang.String ASSIST_ACTION_KEY = "android:assist_action"; + field public static final java.lang.String KEY_ACTION_OBJECT = "object"; + field public static final java.lang.String KEY_ACTION_STATUS = "actionStatus"; + field public static final java.lang.String KEY_DESCRIPTION = "description"; + field public static final java.lang.String KEY_ID = "@id"; + field public static final java.lang.String KEY_NAME = "name"; + field public static final java.lang.String KEY_TYPE = "@type"; + field public static final java.lang.String KEY_URL = "url"; + field public static final java.lang.String STATUS_TYPE_ACTIVE = "ActiveActionStatus"; + field public static final java.lang.String STATUS_TYPE_COMPLETED = "CompletedActionStatus"; + field public static final java.lang.String TYPE_ADD_ACTION = "AddAction"; + field public static final java.lang.String TYPE_BOOKMARK_ACTION = "BookmarkAction"; + field public static final java.lang.String TYPE_LIKE_ACTION = "LikeAction"; + field public static final java.lang.String TYPE_LISTEN_ACTION = "ListenAction"; + field public static final java.lang.String TYPE_VIEW_ACTION = "ViewAction"; + field public static final java.lang.String TYPE_WANT_ACTION = "WantAction"; + field public static final java.lang.String TYPE_WATCH_ACTION = "WatchAction"; + } + + public static final class AssistAction.ActionBuilder { + ctor public AssistAction.ActionBuilder(); + method public android.os.Bundle build(); + method public android.app.AssistAction.ActionBuilder set(java.lang.String, java.lang.String); + method public android.app.AssistAction.ActionBuilder set(java.lang.String, android.os.Bundle); + method public android.app.AssistAction.ActionBuilder setObject(android.os.Bundle); + method public android.app.AssistAction.ActionBuilder setType(java.lang.String); + } + + public static final class AssistAction.ThingBuilder { + ctor public AssistAction.ThingBuilder(); + method public android.os.Bundle build(); + method public android.app.AssistAction.ThingBuilder set(java.lang.String, java.lang.String); + method public android.app.AssistAction.ThingBuilder set(java.lang.String, android.os.Bundle); + method public android.app.AssistAction.ThingBuilder setDescription(java.lang.String); + method public android.app.AssistAction.ThingBuilder setId(java.lang.String); + method public android.app.AssistAction.ThingBuilder setName(java.lang.String); + method public android.app.AssistAction.ThingBuilder setType(java.lang.String); + method public android.app.AssistAction.ThingBuilder setUrl(android.net.Uri); + } + public class AssistContent implements android.os.Parcelable { ctor public AssistContent(); method public int describeContents(); @@ -5100,6 +5149,7 @@ package android.app { method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.app.PendingIntent> CREATOR; field public static final int FLAG_CANCEL_CURRENT = 268435456; // 0x10000000 + field public static final int FLAG_IMMUTABLE = 67108864; // 0x4000000 field public static final int FLAG_NO_CREATE = 536870912; // 0x20000000 field public static final int FLAG_ONE_SHOT = 1073741824; // 0x40000000 field public static final int FLAG_UPDATE_CURRENT = 134217728; // 0x8000000 @@ -5316,6 +5366,11 @@ package android.app { method public void onRejectSharedElements(java.util.List<android.view.View>); method public void onSharedElementEnd(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>); method public void onSharedElementStart(java.util.List<java.lang.String>, java.util.List<android.view.View>, java.util.List<android.view.View>); + method public void onSharedElementsArrived(java.util.List<java.lang.String>, java.util.List<android.view.View>, android.app.SharedElementCallback.OnSharedElementsReadyListener); + } + + public static abstract interface SharedElementCallback.OnSharedElementsReadyListener { + method public abstract void onSharedElementsReady(); } public deprecated class TabActivity extends android.app.ActivityGroup { @@ -9161,6 +9216,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct"; field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand"; field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad"; + field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors"; 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"; @@ -9725,15 +9781,13 @@ package android.database { method public void registerDataSetObserver(android.database.DataSetObserver); method public boolean requery(); method public android.os.Bundle respond(android.os.Bundle); + method public void setExtras(android.os.Bundle); method public void setNotificationUri(android.content.ContentResolver, android.net.Uri); method public void unregisterContentObserver(android.database.ContentObserver); method public void unregisterDataSetObserver(android.database.DataSetObserver); - field protected boolean mClosed; - field protected android.content.ContentResolver mContentResolver; - field protected deprecated java.lang.Long mCurrentRowID; - field protected int mPos; - field protected deprecated int mRowIdColumnIndex; - field protected deprecated java.util.HashMap<java.lang.Long, java.util.Map<java.lang.String, java.lang.Object>> mUpdatedRows; + field protected deprecated boolean mClosed; + field protected deprecated android.content.ContentResolver mContentResolver; + field protected deprecated int mPos; } protected static class AbstractCursor.SelfContentObserver extends android.database.ContentObserver { @@ -9833,6 +9887,7 @@ package android.database { method public abstract void registerDataSetObserver(android.database.DataSetObserver); method public abstract deprecated boolean requery(); method public abstract android.os.Bundle respond(android.os.Bundle); + method public abstract void setExtras(android.os.Bundle); method public abstract void setNotificationUri(android.content.ContentResolver, android.net.Uri); method public abstract void unregisterContentObserver(android.database.ContentObserver); method public abstract void unregisterDataSetObserver(android.database.DataSetObserver); @@ -9904,7 +9959,7 @@ package android.database { ctor public CursorWrapper(android.database.Cursor); method public void close(); method public void copyStringToBuffer(int, android.database.CharArrayBuffer); - method public void deactivate(); + method public deprecated void deactivate(); method public byte[] getBlob(int); method public int getColumnCount(); method public int getColumnIndex(java.lang.String); @@ -9938,8 +9993,9 @@ package android.database { method public boolean moveToPrevious(); method public void registerContentObserver(android.database.ContentObserver); method public void registerDataSetObserver(android.database.DataSetObserver); - method public boolean requery(); + method public deprecated boolean requery(); method public android.os.Bundle respond(android.os.Bundle); + method public void setExtras(android.os.Bundle); method public void setNotificationUri(android.content.ContentResolver, android.net.Uri); method public void unregisterContentObserver(android.database.ContentObserver); method public void unregisterDataSetObserver(android.database.DataSetObserver); @@ -13020,6 +13076,10 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> LENS_INFO_FOCUS_DISTANCE_CALIBRATION; field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> LENS_INFO_HYPERFOCAL_DISTANCE; field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> LENS_INFO_MINIMUM_FOCUS_DISTANCE; + field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_INTRINSIC_CALIBRATION; + field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_POSE_ROTATION; + field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_POSE_TRANSLATION; + field public static final android.hardware.camera2.CameraCharacteristics.Key<float[]> LENS_RADIAL_DISTORTION; field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES; field public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> REQUEST_AVAILABLE_CAPABILITIES; field public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_INPUT_STREAMS; @@ -13439,7 +13499,11 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FOCAL_LENGTH; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> LENS_FOCUS_DISTANCE; field public static final android.hardware.camera2.CaptureResult.Key<android.util.Pair<java.lang.Float, java.lang.Float>> LENS_FOCUS_RANGE; + field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_INTRINSIC_CALIBRATION; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_OPTICAL_STABILIZATION_MODE; + field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_POSE_ROTATION; + field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_POSE_TRANSLATION; + field public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_RADIAL_DISTORTION; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_STATE; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> NOISE_REDUCTION_MODE; field public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR; @@ -14992,6 +15056,7 @@ package android.media { field public static final java.lang.String PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync"; field public static final java.lang.String PARAMETER_KEY_SUSPEND = "drop-input-frames"; field public static final java.lang.String PARAMETER_KEY_VIDEO_BITRATE = "video-bitrate"; + field public static final int REASON_RECLAIMED = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2 } @@ -15007,6 +15072,7 @@ package android.media { public static abstract class MediaCodec.Callback { ctor public MediaCodec.Callback(); + method public void onCodecReleased(android.media.MediaCodec, int); method public abstract void onError(android.media.MediaCodec, android.media.MediaCodec.CodecException); method public abstract void onInputBufferAvailable(android.media.MediaCodec, int); method public abstract void onOutputBufferAvailable(android.media.MediaCodec, int, android.media.MediaCodec.BufferInfo); @@ -15272,6 +15338,7 @@ package android.media { method public static final boolean isCryptoSchemeSupported(java.util.UUID); method public final void release(); method public final boolean requiresSecureDecoderComponent(java.lang.String); + method public final void setMediaDrmSession(byte[]) throws android.media.MediaCryptoException; } public final class MediaCryptoException extends java.lang.Exception { @@ -15327,6 +15394,8 @@ package android.media { method public void removeKeys(byte[]); method public void restoreKeys(byte[], byte[]); method public void setOnEventListener(android.media.MediaDrm.OnEventListener); + method public void setOnExpirationUpdateListener(android.media.MediaDrm.OnExpirationUpdateListener, android.os.Handler); + method public void setOnKeysChangeListener(android.media.MediaDrm.OnKeysChangeListener, android.os.Handler); method public void setPropertyByteArray(java.lang.String, byte[]); method public void setPropertyString(java.lang.String, java.lang.String); field public static final int EVENT_KEY_EXPIRED = 3; // 0x3 @@ -15334,6 +15403,11 @@ package android.media { field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1 field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5 field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4 + field public static final int KEY_STATUS_EXPIRED = 1; // 0x1 + field public static final int KEY_STATUS_INTERNAL_ERROR = 4; // 0x4 + field public static final int KEY_STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2 + field public static final int KEY_STATUS_PENDING = 3; // 0x3 + field public static final int KEY_STATUS_USABLE = 0; // 0x0 field public static final int KEY_TYPE_OFFLINE = 2; // 0x2 field public static final int KEY_TYPE_RELEASE = 3; // 0x3 field public static final int KEY_TYPE_STREAMING = 1; // 0x1 @@ -15360,6 +15434,11 @@ package android.media { method public int getRequestType(); } + public static final class MediaDrm.KeyStatus { + method public byte[] getKeyId(); + method public int getStatusCode(); + } + public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException { method public java.lang.String getDiagnosticInfo(); } @@ -15368,6 +15447,14 @@ package android.media { method public abstract void onEvent(android.media.MediaDrm, byte[], int, int, byte[]); } + public static abstract interface MediaDrm.OnExpirationUpdateListener { + method public abstract void onExpirationUpdate(android.media.MediaDrm, byte[], long); + } + + public static abstract interface MediaDrm.OnKeysChangeListener { + method public abstract void onKeysChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean); + } + public static final class MediaDrm.ProvisionRequest { method public byte[] getData(); method public java.lang.String getDefaultUrl(); @@ -15454,6 +15541,7 @@ package android.media { field public static final java.lang.String KEY_MAX_INPUT_SIZE = "max-input-size"; field public static final java.lang.String KEY_MAX_WIDTH = "max-width"; field public static final java.lang.String KEY_MIME = "mime"; + field public static final java.lang.String KEY_OPERATING_RATE = "operating-rate"; field public static final java.lang.String KEY_PRIORITY = "priority"; field public static final java.lang.String KEY_PROFILE = "profile"; field public static final java.lang.String KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown"; @@ -15576,6 +15664,7 @@ package android.media { field public static final int METADATA_KEY_ARTIST = 2; // 0x2 field public static final int METADATA_KEY_AUTHOR = 3; // 0x3 field public static final int METADATA_KEY_BITRATE = 20; // 0x14 + field public static final int METADATA_KEY_CAPTURE_FRAMERATE = 25; // 0x19 field public static final int METADATA_KEY_CD_TRACK_NUMBER = 0; // 0x0 field public static final int METADATA_KEY_COMPILATION = 15; // 0xf field public static final int METADATA_KEY_COMPOSER = 4; // 0x4 @@ -15979,6 +16068,7 @@ package android.media { method public void configureAudioTrack(android.media.AudioTrack, int); method public void configureSurface(android.view.Surface); method public final android.view.Surface createInputSurface(); + method public boolean getTimestamp(android.media.MediaTimestamp); method public void queueAudio(java.nio.ByteBuffer, int, int, long); method public final void release(); method public void setCallback(android.media.MediaSync.Callback, android.os.Handler); @@ -16000,6 +16090,13 @@ package android.media { field public static final int SYNC_EVENT_PRESENTATION_COMPLETE = 1; // 0x1 } + public final class MediaTimestamp { + ctor public MediaTimestamp(); + field public float clockRate; + field public long mediaTimeUs; + field public long nanoTime; + } + public final class NotProvisionedException extends android.media.MediaDrmException { ctor public NotProvisionedException(java.lang.String); } @@ -16761,9 +16858,8 @@ package android.media.midi { method public int describeContents(); method public int getId(); method public int getInputPortCount(); - method public android.media.midi.MidiDeviceInfo.PortInfo getInputPortInfo(int); method public int getOutputPortCount(); - method public android.media.midi.MidiDeviceInfo.PortInfo getOutputPortInfo(int); + method public android.media.midi.MidiDeviceInfo.PortInfo[] getPortList(); method public android.os.Bundle getProperties(); method public int getType(); method public boolean isPrivate(); @@ -16815,11 +16911,17 @@ package android.media.midi { public final class MidiManager { method public android.media.midi.MidiDeviceInfo[] getDeviceList(); + method public void openBluetoothDevice(android.bluetooth.BluetoothDevice, android.media.midi.MidiManager.BluetoothOpenCallback, android.os.Handler); method public void openDevice(android.media.midi.MidiDeviceInfo, android.media.midi.MidiManager.DeviceOpenCallback, android.os.Handler); method public void registerDeviceCallback(android.media.midi.MidiManager.DeviceCallback, android.os.Handler); method public void unregisterDeviceCallback(android.media.midi.MidiManager.DeviceCallback); } + public static abstract class MidiManager.BluetoothOpenCallback { + ctor public MidiManager.BluetoothOpenCallback(); + method public abstract void onDeviceOpened(android.bluetooth.BluetoothDevice, android.media.midi.MidiDevice); + } + public static class MidiManager.DeviceCallback { ctor public MidiManager.DeviceCallback(); method public void onDeviceAdded(android.media.midi.MidiDeviceInfo); @@ -16841,6 +16943,7 @@ package android.media.midi { public abstract class MidiReceiver { ctor public MidiReceiver(); + method public void flush() throws java.io.IOException; method public int getMaxMessageSize(); method public abstract void onReceive(byte[], int, int, long) throws java.io.IOException; method public void send(byte[], int, int) throws java.io.IOException; @@ -22246,6 +22349,9 @@ package android.os { public class BatteryManager { method public int getIntProperty(int); method public long getLongProperty(int); + method public boolean isCharging(); + field public static final java.lang.String ACTION_CHARGING = "android.os.action.CHARGING"; + field public static final java.lang.String ACTION_DISCHARGING = "android.os.action.DISCHARGING"; field public static final int BATTERY_HEALTH_COLD = 7; // 0x7 field public static final int BATTERY_HEALTH_DEAD = 4; // 0x4 field public static final int BATTERY_HEALTH_GOOD = 2; // 0x2 @@ -23284,6 +23390,7 @@ package android.os { method public android.os.Bundle getApplicationRestrictions(java.lang.String); method public long getSerialNumberForUser(android.os.UserHandle); method public int getUserCount(); + method public long getUserCreationTime(int); method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public java.util.List<android.os.UserHandle> getUserProfiles(); @@ -30524,7 +30631,7 @@ package android.test.mock { ctor public MockCursor(); method public void close(); method public void copyStringToBuffer(int, android.database.CharArrayBuffer); - method public void deactivate(); + method public deprecated void deactivate(); method public byte[] getBlob(int); method public int getColumnCount(); method public int getColumnIndex(java.lang.String); @@ -30557,8 +30664,9 @@ package android.test.mock { method public boolean moveToPrevious(); method public void registerContentObserver(android.database.ContentObserver); method public void registerDataSetObserver(android.database.DataSetObserver); - method public boolean requery(); + method public deprecated boolean requery(); method public android.os.Bundle respond(android.os.Bundle); + method public void setExtras(android.os.Bundle); method public void setNotificationUri(android.content.ContentResolver, android.net.Uri); method public void unregisterContentObserver(android.database.ContentObserver); method public void unregisterDataSetObserver(android.database.DataSetObserver); @@ -32508,6 +32616,7 @@ package android.transition { ctor public TransitionManager(); method public static void beginDelayedTransition(android.view.ViewGroup); method public static void beginDelayedTransition(android.view.ViewGroup, android.transition.Transition); + method public static void endTransitions(android.view.ViewGroup); method public static void go(android.transition.Scene); method public static void go(android.transition.Scene, android.transition.Transition); method public void setTransition(android.transition.Scene, android.transition.Transition); @@ -33526,10 +33635,10 @@ package android.view { method public java.lang.String getName(); method public int getProductId(); method public int getSources(); - method public java.lang.String getUniqueId(); method public int getVendorId(); method public android.os.Vibrator getVibrator(); method public boolean[] hasKeys(int...); + method public boolean hasMic(); method public boolean isVirtual(); method public boolean supportsSource(int); method public void writeToParcel(android.os.Parcel, int); |