diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 93 |
1 files changed, 40 insertions, 53 deletions
diff --git a/api/current.txt b/api/current.txt index 8e8c750..a8bf949 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2017,6 +2017,7 @@ package android.accessibilityservice { method protected void onServiceConnected(); method public final boolean performGlobalAction(int); method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo); + field public static final int GESTURE_DOUBLE_TAP = 17; // 0x11 field public static final int GESTURE_SWIPE_DOWN = 2; // 0x2 field public static final int GESTURE_SWIPE_DOWN_AND_LEFT = 15; // 0xf field public static final int GESTURE_SWIPE_DOWN_AND_RIGHT = 16; // 0x10 @@ -2033,8 +2034,7 @@ package android.accessibilityservice { field public static final int GESTURE_SWIPE_UP_AND_DOWN = 7; // 0x7 field public static final int GESTURE_SWIPE_UP_AND_LEFT = 13; // 0xd field public static final int GESTURE_SWIPE_UP_AND_RIGHT = 14; // 0xe - field public static final int GESTURE_TWO_FINGER_LONG_PRESS = 18; // 0x12 - field public static final int GESTURE_TWO_FINGER_TAP = 17; // 0x11 + field public static final int GESTURE_TAP_AND_HOLD = 18; // 0x12 field public static final int GLOBAL_ACTION_BACK = 1; // 0x1 field public static final int GLOBAL_ACTION_HOME = 2; // 0x2 field public static final int GLOBAL_ACTION_NOTIFICATIONS = 4; // 0x4 @@ -11236,7 +11236,6 @@ package android.media { method public void unselectTrack(int); field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2 field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1 - field public static final int SEEK_TO_CLOSEST = 3; // 0x3 field public static final int SEEK_TO_CLOSEST_SYNC = 2; // 0x2 field public static final int SEEK_TO_NEXT_SYNC = 1; // 0x1 field public static final int SEEK_TO_PREVIOUS_SYNC = 0; // 0x0 @@ -12709,21 +12708,6 @@ package android.net.http { package android.net.nsd { - public class DnsSdServiceInfo implements android.os.Parcelable { - ctor public DnsSdServiceInfo(); - method public int describeContents(); - method public java.net.InetAddress getHost(); - method public int getPort(); - method public java.lang.String getServiceName(); - method public java.lang.String getServiceType(); - method public void setHost(java.net.InetAddress); - method public void setPort(int); - method public void setServiceName(java.lang.String); - method public void setServiceType(java.lang.String); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - public class DnsSdTxtRecord implements android.os.Parcelable { ctor public DnsSdTxtRecord(); ctor public DnsSdTxtRecord(byte[]); @@ -12740,53 +12724,56 @@ package android.net.nsd { field public static final android.os.Parcelable.Creator CREATOR; } - public class NsdManager { - method public void deinitialize(android.net.nsd.NsdManager.Channel); - method public void discoverServices(android.net.nsd.NsdManager.Channel, java.lang.String, android.net.nsd.NsdManager.DnsSdDiscoveryListener); - method public void initialize(android.content.Context, android.os.Looper, android.net.nsd.NsdManager.ChannelListener); - method public void registerService(android.net.nsd.NsdManager.Channel, java.lang.String, java.lang.String, int, android.net.nsd.NsdManager.DnsSdRegisterListener); - method public void resolveService(android.net.nsd.NsdManager.Channel, java.lang.String, java.lang.String, android.net.nsd.NsdManager.DnsSdResolveListener); - method public void stopServiceDiscovery(android.net.nsd.NsdManager.Channel, android.net.nsd.NsdManager.ActionListener); - method public void unregisterService(android.net.nsd.NsdManager.Channel, int, android.net.nsd.NsdManager.ActionListener); + public final class NsdManager { + method public void discoverServices(java.lang.String, int, android.net.nsd.NsdManager.DiscoveryListener); + method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener); + method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener); + method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener); + method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener); field public static final java.lang.String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED"; - field public static final int ALREADY_ACTIVE = 3; // 0x3 - field public static final int BUSY = 2; // 0x2 - field public static final int ERROR = 0; // 0x0 field public static final java.lang.String EXTRA_NSD_STATE = "nsd_state"; - field public static final int MAX_REGS_REACHED = 4; // 0x4 + field public static final int FAILURE_ALREADY_ACTIVE = 3; // 0x3 + field public static final int FAILURE_INTERNAL_ERROR = 0; // 0x0 + field public static final int FAILURE_MAX_LIMIT = 4; // 0x4 field public static final int NSD_STATE_DISABLED = 1; // 0x1 field public static final int NSD_STATE_ENABLED = 2; // 0x2 - field public static final int UNSUPPORTED = 1; // 0x1 - } - - public static abstract interface NsdManager.ActionListener { - method public abstract void onFailure(int); - method public abstract void onSuccess(); + field public static final int PROTOCOL_DNS_SD = 1; // 0x1 } - public static class NsdManager.Channel { + public static abstract interface NsdManager.DiscoveryListener { + method public abstract void onDiscoveryStarted(java.lang.String); + method public abstract void onDiscoveryStopped(java.lang.String); + method public abstract void onServiceFound(android.net.nsd.NsdServiceInfo); + method public abstract void onServiceLost(android.net.nsd.NsdServiceInfo); + method public abstract void onStartDiscoveryFailed(java.lang.String, int); + method public abstract void onStopDiscoveryFailed(java.lang.String, int); } - public static abstract interface NsdManager.ChannelListener { - method public abstract void onChannelConnected(android.net.nsd.NsdManager.Channel); - method public abstract void onChannelDisconnected(); + public static abstract interface NsdManager.RegistrationListener { + method public abstract void onRegistrationFailed(android.net.nsd.NsdServiceInfo, int); + method public abstract void onServiceRegistered(android.net.nsd.NsdServiceInfo); + method public abstract void onServiceUnregistered(android.net.nsd.NsdServiceInfo); + method public abstract void onUnregistrationFailed(android.net.nsd.NsdServiceInfo, int); } - public static abstract interface NsdManager.DnsSdDiscoveryListener { - method public abstract void onFailure(int); - method public abstract void onServiceFound(android.net.nsd.DnsSdServiceInfo); - method public abstract void onServiceLost(android.net.nsd.DnsSdServiceInfo); - method public abstract void onStarted(java.lang.String); + public static abstract interface NsdManager.ResolveListener { + method public abstract void onResolveFailed(android.net.nsd.NsdServiceInfo, int); + method public abstract void onServiceResolved(android.net.nsd.NsdServiceInfo); } - public static abstract interface NsdManager.DnsSdRegisterListener { - method public abstract void onFailure(int); - method public abstract void onServiceRegistered(int, android.net.nsd.DnsSdServiceInfo); - } - - public static abstract interface NsdManager.DnsSdResolveListener { - method public abstract void onFailure(int); - method public abstract void onServiceResolved(android.net.nsd.DnsSdServiceInfo); + public final class NsdServiceInfo implements android.os.Parcelable { + ctor public NsdServiceInfo(); + method public int describeContents(); + method public java.net.InetAddress getHost(); + method public int getPort(); + method public java.lang.String getServiceName(); + method public java.lang.String getServiceType(); + method public void setHost(java.net.InetAddress); + method public void setPort(int); + method public void setServiceName(java.lang.String); + method public void setServiceType(java.lang.String); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; } } |