diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 265 |
1 files changed, 106 insertions, 159 deletions
diff --git a/api/current.txt b/api/current.txt index c34cd24..265c682 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12661,6 +12661,9 @@ package android.hardware.camera2.params { method public int getWidth(); method public int getX(); method public int getY(); + field public static final int METERING_WEIGHT_DONT_CARE = 0; // 0x0 + field public static final int METERING_WEIGHT_MAX = 1000; // 0x3e8 + field public static final int METERING_WEIGHT_MIN = 0; // 0x0 } public final class RggbChannelVector { @@ -14194,7 +14197,6 @@ package android.media { method public final void release(); method public final void releaseOutputBuffer(int, boolean); method public final void releaseOutputBuffer(int, long); - method public void setNotificationCallback(android.media.MediaCodec.NotificationCallback); method public final void setParameters(android.os.Bundle); method public final void setVideoScalingMode(int); method public final void signalEndOfInputStream(); @@ -14244,10 +14246,6 @@ package android.media { field public int numSubSamples; } - public static abstract interface MediaCodec.NotificationCallback { - method public abstract void onCodecNotify(android.media.MediaCodec); - } - public final class MediaCodecInfo { method public final android.media.MediaCodecInfo.CodecCapabilities getCapabilitiesForType(java.lang.String); method public final java.lang.String getName(); @@ -14576,6 +14574,7 @@ package android.media { method public long getLong(java.lang.String); method public android.media.Rating getRating(java.lang.String); method public java.lang.String getString(java.lang.String); + method public java.util.Set<java.lang.String> keySet(); method public int size(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; @@ -15713,56 +15712,81 @@ package android.media.session { public final class MediaController { method public void addCallback(android.media.session.MediaController.Callback); method public void addCallback(android.media.session.MediaController.Callback, android.os.Handler); + method public boolean dispatchMediaButtonEvent(android.view.KeyEvent); method public static android.media.session.MediaController fromToken(android.media.session.MediaSessionToken); - method public android.media.session.TransportController getTransportController(); + method public android.media.MediaMetadata getMetadata(); + method public android.media.session.PlaybackState getPlaybackState(); + method public int getRatingType(); + method public android.media.session.MediaController.TransportControls getTransportControls(); method public void removeCallback(android.media.session.MediaController.Callback); - method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public void sendMediaButton(int); + method public void sendControlCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); } public static abstract class MediaController.Callback { ctor public MediaController.Callback(); - method public void onEvent(java.lang.String, android.os.Bundle); + method public void onMetadataChanged(android.media.MediaMetadata); + method public void onPlaybackStateChanged(android.media.session.PlaybackState); + method public void onSessionEvent(java.lang.String, android.os.Bundle); + } + + public final class MediaController.TransportControls { + method public void fastForward(); + method public void pause(); + method public void play(); + method public void rewind(); + method public void seekTo(long); + method public void setRating(android.media.Rating); + method public void skipToNext(); + method public void skipToPrevious(); + method public void stop(); } public final class MediaSession { method public void addCallback(android.media.session.MediaSession.Callback); method public void addCallback(android.media.session.MediaSession.Callback, android.os.Handler); + method public void addTransportControlsCallback(android.media.session.MediaSession.TransportControlsCallback); + method public void addTransportControlsCallback(android.media.session.MediaSession.TransportControlsCallback, android.os.Handler); method public android.media.session.MediaSessionToken getSessionToken(); - method public android.media.session.TransportPerformer getTransportPerformer(); method public boolean isActive(); method public void release(); method public void removeCallback(android.media.session.MediaSession.Callback); - method public void sendEvent(java.lang.String, android.os.Bundle); + method public void removeTransportControlsCallback(android.media.session.MediaSession.TransportControlsCallback); + method public void sendSessionEvent(java.lang.String, android.os.Bundle); method public void setActive(boolean); method public void setFlags(int); method public void setLaunchPendingIntent(android.app.PendingIntent); - method public void useLocalPlayback(int); - method public void useRemotePlayback(android.media.session.RemoteVolumeProvider); + method public void setMetadata(android.media.MediaMetadata); + method public void setPlaybackState(android.media.session.PlaybackState); + method public void setPlaybackToLocal(int); + method public void setPlaybackToRemote(android.media.session.RemoteVolumeProvider); field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1 field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2 } public static abstract class MediaSession.Callback { ctor public MediaSession.Callback(); - method public void onCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public void onMediaButton(android.content.Intent); + method public void onControlCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); + method public void onMediaButtonEvent(android.content.Intent); } - public final class MediaSessionInfo implements android.os.Parcelable { - method public int describeContents(); - method public java.lang.String getId(); - method public java.lang.String getPackageName(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; + public static abstract class MediaSession.TransportControlsCallback { + ctor public MediaSession.TransportControlsCallback(); + method public void onFastForward(); + method public void onPause(); + method public void onPlay(); + method public void onRewind(); + method public void onSeekTo(long); + method public void onSetRating(android.media.Rating); + method public void onSkipToNext(); + method public void onSkipToPrevious(); + method public void onStop(); } public final class MediaSessionManager { method public android.media.session.MediaSession createSession(java.lang.String); - method public java.util.List<android.media.session.MediaController> getActiveSessions(android.content.ComponentName); } - public class MediaSessionToken implements android.os.Parcelable { + public final class MediaSessionToken implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; @@ -15774,95 +15798,50 @@ package android.media.session { method public int describeContents(); method public long getActions(); method public long getBufferPosition(); - method public java.lang.String getErrorMessage(); + method public java.lang.CharSequence getErrorMessage(); + method public float getPlaybackRate(); method public long getPosition(); - method public float getRate(); method public int getState(); method public void setActions(long); method public void setBufferPosition(long); - method public void setErrorMessage(java.lang.String); + method public void setErrorMessage(java.lang.CharSequence); method public void setState(int, long, float); method public void writeToParcel(android.os.Parcel, int); - field public static final long ACTION_FASTFORWARD = 64L; // 0x40L - field public static final long ACTION_NEXT_ITEM = 32L; // 0x20L + field public static final long ACTION_FAST_FORWARD = 64L; // 0x40L field public static final long ACTION_PAUSE = 2L; // 0x2L field public static final long ACTION_PLAY = 4L; // 0x4L field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L - field public static final long ACTION_PREVIOUS_ITEM = 16L; // 0x10L - field public static final long ACTION_RATING = 128L; // 0x80L field public static final long ACTION_REWIND = 8L; // 0x8L field public static final long ACTION_SEEK_TO = 256L; // 0x100L + field public static final long ACTION_SET_RATING = 128L; // 0x80L + field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L + field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L field public static final long ACTION_STOP = 1L; // 0x1L field public static final android.os.Parcelable.Creator CREATOR; field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL - field public static final int PLAYSTATE_BUFFERING = 6; // 0x6 - field public static final int PLAYSTATE_ERROR = 7; // 0x7 - field public static final int PLAYSTATE_FAST_FORWARDING = 4; // 0x4 - field public static final int PLAYSTATE_NONE = 0; // 0x0 - field public static final int PLAYSTATE_PAUSED = 2; // 0x2 - field public static final int PLAYSTATE_PLAYING = 3; // 0x3 - field public static final int PLAYSTATE_REWINDING = 5; // 0x5 - field public static final int PLAYSTATE_SKIPPING_BACKWARDS = 9; // 0x9 - field public static final int PLAYSTATE_SKIPPING_FORWARDS = 10; // 0xa - field public static final int PLAYSTATE_STOPPED = 1; // 0x1 + field public static final int STATE_BUFFERING = 6; // 0x6 + field public static final int STATE_ERROR = 7; // 0x7 + field public static final int STATE_FAST_FORWARDING = 4; // 0x4 + field public static final int STATE_NONE = 0; // 0x0 + field public static final int STATE_PAUSED = 2; // 0x2 + field public static final int STATE_PLAYING = 3; // 0x3 + field public static final int STATE_REWINDING = 5; // 0x5 + field public static final int STATE_SKIPPING_TO_NEXT = 10; // 0xa + field public static final int STATE_SKIPPING_TO_PREVIOUS = 9; // 0x9 + field public static final int STATE_STOPPED = 1; // 0x1 } public abstract class RemoteVolumeProvider { ctor public RemoteVolumeProvider(int, int); - method public abstract int getCurrentVolume(); - method public final int getFlags(); method public final int getMaxVolume(); + method public final int getVolumeControl(); method public final void notifyVolumeChanged(); - method public void onAdjustVolume(int); - method public void onSetVolume(int); - field public static final int FLAG_VOLUME_ABSOLUTE = 2; // 0x2 - field public static final int FLAG_VOLUME_RELATIVE = 1; // 0x1 - } - - public final class TransportController { - method public void addStateListener(android.media.session.TransportController.TransportStateListener); - method public void addStateListener(android.media.session.TransportController.TransportStateListener, android.os.Handler); - method public void fastForward(); - method public android.media.MediaMetadata getMetadata(); - method public android.media.session.PlaybackState getPlaybackState(); - method public int getRatingType(); - method public void next(); - method public void pause(); - method public void play(); - method public void previous(); - method public void rate(android.media.Rating); - method public void removeStateListener(android.media.session.TransportController.TransportStateListener); - method public void rewind(); - method public void seekTo(long); - method public void stop(); - } - - public static abstract class TransportController.TransportStateListener { - ctor public TransportController.TransportStateListener(); - method public void onMetadataChanged(android.media.MediaMetadata); - method public void onPlaybackStateChanged(android.media.session.PlaybackState); - } - - public final class TransportPerformer { - method public void addListener(android.media.session.TransportPerformer.Listener); - method public void addListener(android.media.session.TransportPerformer.Listener, android.os.Handler); - method public void removeListener(android.media.session.TransportPerformer.Listener); - method public final void setMetadata(android.media.MediaMetadata); - method public final void setPlaybackState(android.media.session.PlaybackState); - } - - public static abstract class TransportPerformer.Listener { - ctor public TransportPerformer.Listener(); - method public void onFastForward(); - method public void onNext(); - method public void onPause(); - method public void onPlay(); - method public void onPrevious(); - method public void onRate(android.media.Rating); - method public void onRewind(); - method public void onRouteFocusChange(int); - method public void onSeekTo(long); - method public void onStop(); + method public void onAdjustVolumeBy(int); + method public abstract int onGetCurrentVolume(); + method public void onSetVolumeTo(int); + field public static final int VOLUME_CONTROL_ABSOLUTE = 2; // 0x2 + field public static final int VOLUME_CONTROL_FIXED = 0; // 0x0 + field public static final int VOLUME_CONTROL_RELATIVE = 1; // 0x1 } } @@ -20443,6 +20422,37 @@ package android.os { ctor public BadParcelableException(java.lang.Exception); } + public class BaseBundle { + method public void clear(); + method public boolean containsKey(java.lang.String); + method public java.lang.Object get(java.lang.String); + method public double getDouble(java.lang.String); + method public double getDouble(java.lang.String, double); + method public double[] getDoubleArray(java.lang.String); + method public int getInt(java.lang.String); + method public int getInt(java.lang.String, int); + method public int[] getIntArray(java.lang.String); + method public long getLong(java.lang.String); + method public long getLong(java.lang.String, long); + method public long[] getLongArray(java.lang.String); + method public java.lang.String getString(java.lang.String); + method public java.lang.String getString(java.lang.String, java.lang.String); + method public java.lang.String[] getStringArray(java.lang.String); + method public boolean isEmpty(); + method public java.util.Set<java.lang.String> keySet(); + method public void putAll(android.os.PersistableBundle); + method public void putDouble(java.lang.String, double); + method public void putDoubleArray(java.lang.String, double[]); + method public void putInt(java.lang.String, int); + method public void putIntArray(java.lang.String, int[]); + method public void putLong(java.lang.String, long); + method public void putLongArray(java.lang.String, long[]); + method public void putString(java.lang.String, java.lang.String); + method public void putStringArray(java.lang.String, java.lang.String[]); + method public void remove(java.lang.String); + method public int size(); + } + public class BatteryManager { ctor public BatteryManager(); method public android.os.BatteryProperty getProperty(int) throws android.os.RemoteException; @@ -20571,17 +20581,14 @@ package android.os { field public static final int L = 10000; // 0x2710 } - public final class Bundle extends android.os.CommonBundle { + public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { ctor public Bundle(); ctor public Bundle(java.lang.ClassLoader); ctor public Bundle(int); ctor public Bundle(android.os.Bundle); ctor public Bundle(android.os.PersistableBundle); - method public void clear(); method public java.lang.Object clone(); - method public boolean containsKey(java.lang.String); method public int describeContents(); - method public java.lang.Object get(java.lang.String); method public android.os.IBinder getBinder(java.lang.String); method public boolean getBoolean(java.lang.String); method public boolean getBoolean(java.lang.String, boolean); @@ -20598,37 +20605,21 @@ package android.os { method public java.lang.CharSequence[] getCharSequenceArray(java.lang.String); method public java.util.ArrayList<java.lang.CharSequence> getCharSequenceArrayList(java.lang.String); method public java.lang.ClassLoader getClassLoader(); - method public double getDouble(java.lang.String); - method public double getDouble(java.lang.String, double); - method public double[] getDoubleArray(java.lang.String); method public float getFloat(java.lang.String); method public float getFloat(java.lang.String, float); method public float[] getFloatArray(java.lang.String); - method public int getInt(java.lang.String); - method public int getInt(java.lang.String, int); - method public int[] getIntArray(java.lang.String); method public java.util.ArrayList<java.lang.Integer> getIntegerArrayList(java.lang.String); - method public long getLong(java.lang.String); - method public long getLong(java.lang.String, long); - method public long[] getLongArray(java.lang.String); method public T getParcelable(java.lang.String); method public android.os.Parcelable[] getParcelableArray(java.lang.String); method public java.util.ArrayList<T> getParcelableArrayList(java.lang.String); - method public android.os.PersistableBundle getPersistableBundle(java.lang.String); method public java.io.Serializable getSerializable(java.lang.String); method public short getShort(java.lang.String); method public short getShort(java.lang.String, short); method public short[] getShortArray(java.lang.String); method public android.util.SparseArray<T> getSparseParcelableArray(java.lang.String); - method public java.lang.String getString(java.lang.String); - method public java.lang.String getString(java.lang.String, java.lang.String); - method public java.lang.String[] getStringArray(java.lang.String); method public java.util.ArrayList<java.lang.String> getStringArrayList(java.lang.String); method public boolean hasFileDescriptors(); - method public boolean isEmpty(); - method public java.util.Set<java.lang.String> keySet(); method public void putAll(android.os.Bundle); - method public void putAll(android.os.PersistableBundle); method public void putBinder(java.lang.String, android.os.IBinder); method public void putBoolean(java.lang.String, boolean); method public void putBooleanArray(java.lang.String, boolean[]); @@ -20640,30 +20631,19 @@ package android.os { method public void putCharSequence(java.lang.String, java.lang.CharSequence); method public void putCharSequenceArray(java.lang.String, java.lang.CharSequence[]); method public void putCharSequenceArrayList(java.lang.String, java.util.ArrayList<java.lang.CharSequence>); - method public void putDouble(java.lang.String, double); - method public void putDoubleArray(java.lang.String, double[]); method public void putFloat(java.lang.String, float); method public void putFloatArray(java.lang.String, float[]); - method public void putInt(java.lang.String, int); - method public void putIntArray(java.lang.String, int[]); method public void putIntegerArrayList(java.lang.String, java.util.ArrayList<java.lang.Integer>); - method public void putLong(java.lang.String, long); - method public void putLongArray(java.lang.String, long[]); method public void putParcelable(java.lang.String, android.os.Parcelable); method public void putParcelableArray(java.lang.String, android.os.Parcelable[]); method public void putParcelableArrayList(java.lang.String, java.util.ArrayList<? extends android.os.Parcelable>); - method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle); method public void putSerializable(java.lang.String, java.io.Serializable); method public void putShort(java.lang.String, short); method public void putShortArray(java.lang.String, short[]); method public void putSparseParcelableArray(java.lang.String, android.util.SparseArray<? extends android.os.Parcelable>); - method public void putString(java.lang.String, java.lang.String); - method public void putStringArray(java.lang.String, java.lang.String[]); method public void putStringArrayList(java.lang.String, java.util.ArrayList<java.lang.String>); method public void readFromParcel(android.os.Parcel); - method public void remove(java.lang.String); method public void setClassLoader(java.lang.ClassLoader); - method public int size(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; field public static final android.os.Bundle EMPTY; @@ -20681,9 +20661,6 @@ package android.os { method public abstract void onCancel(); } - abstract class CommonBundle implements java.lang.Cloneable android.os.Parcelable { - } - public class ConditionVariable { ctor public ConditionVariable(); ctor public ConditionVariable(boolean); @@ -21263,46 +21240,14 @@ package android.os { field public static final int PATTERN_SIMPLE_GLOB = 2; // 0x2 } - public final class PersistableBundle extends android.os.CommonBundle { + public final class PersistableBundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { ctor public PersistableBundle(); - ctor public PersistableBundle(java.lang.ClassLoader); ctor public PersistableBundle(int); ctor public PersistableBundle(android.os.PersistableBundle); - method public void clear(); method public java.lang.Object clone(); - method public boolean containsKey(java.lang.String); method public int describeContents(); - method public java.lang.Object get(java.lang.String); - method public java.lang.ClassLoader getClassLoader(); - method public double getDouble(java.lang.String); - method public double getDouble(java.lang.String, double); - method public double[] getDoubleArray(java.lang.String); - method public int getInt(java.lang.String); - method public int getInt(java.lang.String, int); - method public int[] getIntArray(java.lang.String); - method public long getLong(java.lang.String); - method public long getLong(java.lang.String, long); - method public long[] getLongArray(java.lang.String); method public android.os.PersistableBundle getPersistableBundle(java.lang.String); - method public java.lang.String getString(java.lang.String); - method public java.lang.String getString(java.lang.String, java.lang.String); - method public java.lang.String[] getStringArray(java.lang.String); - method public boolean isEmpty(); - method public java.util.Set<java.lang.String> keySet(); - method public void putAll(android.os.PersistableBundle); - method public void putDouble(java.lang.String, double); - method public void putDoubleArray(java.lang.String, double[]); - method public void putInt(java.lang.String, int); - method public void putIntArray(java.lang.String, int[]); - method public void putLong(java.lang.String, long); - method public void putLongArray(java.lang.String, long[]); method public void putPersistableBundle(java.lang.String, android.os.PersistableBundle); - method public void putString(java.lang.String, java.lang.String); - method public void putStringArray(java.lang.String, java.lang.String[]); - method public void readFromParcel(android.os.Parcel); - method public void remove(java.lang.String); - method public void setClassLoader(java.lang.ClassLoader); - method public int size(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; field public static final android.os.PersistableBundle EMPTY; @@ -37700,8 +37645,10 @@ package android.widget { method public void setOnMenuItemClickListener(android.widget.Toolbar.OnMenuItemClickListener); method public void setSubtitle(int); method public void setSubtitle(java.lang.CharSequence); + method public void setSubtitleTextAppearance(android.content.Context, int); method public void setTitle(int); method public void setTitle(java.lang.CharSequence); + method public void setTitleTextAppearance(android.content.Context, int); method public boolean showOverflowMenu(); } |