Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-dev
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 78bf9af..6487c92 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -25,6 +25,7 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.os.ResultReceiver;
 import android.provider.Settings;
 
 import java.net.InetAddress;
@@ -1294,4 +1295,67 @@
         } catch (RemoteException e) {
         }
     }
+
+    /**
+     * The ResultReceiver resultCode for checkMobileProvisioning (CMP_RESULT_CODE)
+     */
+
+    /**
+     * No connection was possible to the network.
+     * {@hide}
+     */
+    public static final int CMP_RESULT_CODE_NO_CONNECTION = 0;
+
+    /**
+     * A connection was made to the internet, all is well.
+     * {@hide}
+     */
+    public static final int CMP_RESULT_CODE_CONNECTABLE = 1;
+
+    /**
+     * A connection was made but there was a redirection, we appear to be in walled garden.
+     * This is an indication of a warm sim on a mobile network.
+     * {@hide}
+     */
+    public static final int CMP_RESULT_CODE_REDIRECTED = 2;
+
+    /**
+     * A connection was made but no dns server was available to resolve a name to address.
+     * This is an indication of a warm sim on a mobile network.
+     *
+     * {@hide}
+     */
+    public static final int CMP_RESULT_CODE_NO_DNS = 3;
+
+    /**
+     * A connection was made but could not open a TCP connection.
+     * This is an indication of a warm sim on a mobile network.
+     * {@hide}
+     */
+    public static final int CMP_RESULT_CODE_NO_TCP_CONNECTION = 4;
+
+    /**
+     * Check mobile provisioning. The resultCode passed to
+     * onReceiveResult will be one of the CMP_RESULT_CODE_xxxx values above.
+     * This may take a minute or more to complete.
+     *
+     * @param sendNotificaiton, when true a notification will be sent to user.
+     * @param suggestedTimeOutMs, timeout in milliseconds
+     * @param resultReceiver needs to  be supplied to receive the result
+     *
+     * @return time out that will be used, maybe less that suggestedTimeOutMs
+     * -1 if an error.
+     *
+     * {@hide}
+     */
+    public int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs,
+            ResultReceiver resultReceiver) {
+        int timeOutMs = -1;
+        try {
+            timeOutMs = mService.checkMobileProvisioning(sendNotification, suggestedTimeOutMs,
+                    resultReceiver);
+        } catch (RemoteException e) {
+        }
+        return timeOutMs;
+    }
 }
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index e5d6e51..3dbe078 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -24,6 +24,7 @@
 import android.os.IBinder;
 import android.os.Messenger;
 import android.os.ParcelFileDescriptor;
+import android.os.ResultReceiver;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
@@ -131,4 +132,6 @@
     void supplyMessenger(int networkType, in Messenger messenger);
 
     int findConnectionTypeForIface(in String iface);
+
+    int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs, in ResultReceiver resultReceiver);
 }
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index e85dbcd..5a1daed 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -494,6 +494,19 @@
     }
 
     /**
+     * Eanble/disable FailFast
+     *
+     * @param enabled is DctConstants.ENABLED/DISABLED
+     */
+    public void setEnableFailFastMobileData(int enabled) {
+        if (DBG) log("setEnableFailFastMobileData(enabled=" + enabled + ")");
+        final AsyncChannel channel = mDataConnectionTrackerAc;
+        if (channel != null) {
+            channel.sendMessage(DctConstants.CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA, enabled);
+        }
+    }
+
+    /**
      * carrier dependency is met/unmet
      * @param met
      */
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 0827f7c..67c2cfd 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -271,6 +271,17 @@
     return (jint) AudioSystem::getPrimaryOutputFrameCount();
 }
 
+static jint
+android_media_AudioSystem_getOutputLatency(JNIEnv *env, jobject clazz, jint stream)
+{
+    uint32_t afLatency;
+    if (AudioSystem::getOutputLatency(&afLatency, static_cast <audio_stream_type_t>(stream))
+            != NO_ERROR) {
+        afLatency = -1;
+    }
+    return (jint) afLatency;
+}
+
 // ----------------------------------------------------------------------------
 
 static JNINativeMethod gMethods[] = {
@@ -296,6 +307,7 @@
     {"getDevicesForStream", "(I)I",     (void *)android_media_AudioSystem_getDevicesForStream},
     {"getPrimaryOutputSamplingRate", "()I", (void *)android_media_AudioSystem_getPrimaryOutputSamplingRate},
     {"getPrimaryOutputFrameCount",   "()I", (void *)android_media_AudioSystem_getPrimaryOutputFrameCount},
+    {"getOutputLatency",    "(I)I",     (void *)android_media_AudioSystem_getOutputLatency},
 };
 
 int register_android_media_AudioSystem(JNIEnv *env)
diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index e2d34c9..3ff9dda 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -728,6 +728,19 @@
 
 
 // ----------------------------------------------------------------------------
+static jint android_media_AudioTrack_get_latency(JNIEnv *env,  jobject thiz) {
+    sp<AudioTrack> lpTrack = getAudioTrack(env, thiz);
+
+    if (lpTrack == NULL) {
+        jniThrowException(env, "java/lang/IllegalStateException",
+            "Unable to retrieve AudioTrack pointer for latency()");
+        return AUDIOTRACK_ERROR;
+    }
+    return (jint)lpTrack->latency();
+}
+
+
+// ----------------------------------------------------------------------------
 static jint android_media_AudioTrack_set_loop(JNIEnv *env,  jobject thiz,
         jint loopStart, jint loopEnd, jint loopCount) {
     sp<AudioTrack> lpTrack = getAudioTrack(env, thiz);
@@ -854,6 +867,7 @@
                              "()I",      (void *)android_media_AudioTrack_get_pos_update_period},
     {"native_set_position",  "(I)I",     (void *)android_media_AudioTrack_set_position},
     {"native_get_position",  "()I",      (void *)android_media_AudioTrack_get_position},
+    {"native_get_latency",   "()I",      (void *)android_media_AudioTrack_get_latency},
     {"native_set_loop",      "(III)I",   (void *)android_media_AudioTrack_set_loop},
     {"native_reload_static", "()I",      (void *)android_media_AudioTrack_reload},
     {"native_get_output_sample_rate",
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index 7306042..405a978 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index eb58502..c84c0e2 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index cade61d..d694917 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 10e3d45..fe11bb6 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 11c97c2..76cab7a 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index 77f89d1..8c82e3a 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index d1d83a0..a465d7c 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 3c6818b..6c9a5f3 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index f09914c..50a7c8c 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -427,9 +427,9 @@
     <string name="permlab_readCallLog" msgid="3478133184624102739">"Anrufliste lesen"</string>
     <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"Ermöglicht der App, die Anrufliste Ihres Tablets zu lesen, einschließlich der Daten über ein- und ausgehende Anrufe. Die Berechtigung erlaubt Apps, Ihre Anruflistendaten zu speichern, und schädliche Apps können diese Daten ohne Ihr Wissen weiterleiten."</string>
     <string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"Ermöglicht der App, die Anrufliste Ihres Telefons zu lesen, einschließlich der Daten über ein- und ausgehende Anrufe. Die Berechtigung erlaubt Apps, Ihre Anruflistendaten zu speichern, und schädliche Apps können diese Daten ohne Ihr Wissen weiterleiten."</string>
-    <string name="permlab_writeCallLog" msgid="8552045664743499354">"Anrufprotokoll bearbeiten"</string>
-    <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Ermöglicht der App, das Anrufprotokoll Ihres Tablets zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so Ihr Anrufprotokoll löschen oder ändern."</string>
-    <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Ermöglicht der App, das Anrufprotokoll Ihres Telefons zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so Ihr Anrufprotokoll löschen oder ändern."</string>
+    <string name="permlab_writeCallLog" msgid="8552045664743499354">"Anrufliste bearbeiten"</string>
+    <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Ermöglicht der App, die Anrufliste Ihres Tablets zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so Ihre Anrufliste löschen oder ändern."</string>
+    <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Ermöglicht der App, die Anrufliste Ihres Telefons zu ändern, einschließlich der Daten über ein- und ausgehende Anrufe. Schädliche Apps können so Ihre Anrufliste löschen oder ändern."</string>
     <string name="permlab_readProfile" msgid="4701889852612716678">"Meine Kontaktkarten lesen"</string>
     <string name="permdesc_readProfile" product="default" msgid="5462475151849888848">"Ermöglicht der App, auf Ihrem Gerät gespeicherte personenbezogene Profildaten zu lesen, einschließlich Ihres Namens und Ihrer Kontaktdaten. Die App kann Sie somit identifizieren und Ihre Profildaten an andere senden."</string>
     <string name="permlab_writeProfile" msgid="907793628777397643">"Meine Kontaktkarten ändern"</string>
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo!"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
@@ -1433,7 +1434,7 @@
     <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string>
     <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string>
     <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-Audio"</string>
-    <string name="wireless_display_route_description" msgid="9070346425023979651">"Kabellose Übertragung"</string>
+    <string name="wireless_display_route_description" msgid="9070346425023979651">"Kabellose Übertragung (WiDi)"</string>
     <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fertig"</string>
     <string name="media_route_button_content_description" msgid="5758553567065145276">"Medienausgabe"</string>
     <string name="media_route_status_scanning" msgid="7279908761758293783">"Wird gescannt..."</string>
@@ -1444,7 +1445,7 @@
     <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-Bildschirm"</string>
     <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay-Nr. <xliff:g id="ID">%1$d</xliff:g>"</string>
     <string name="display_manager_overlay_display_title" msgid="652124517672257172">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> x <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> dpi"</string>
-    <string name="wifi_display_notification_title" msgid="2223050649240326557">"WLAN-Anzeige ist aktiv."</string>
+    <string name="wifi_display_notification_title" msgid="2223050649240326557">"Kabellose Übertragung (WiDi) ist aktiviert."</string>
     <string name="wifi_display_notification_message" msgid="4498802012464170685">"Dieser Bildschirm wird auf einem anderen Gerät angezeigt."</string>
     <string name="wifi_display_notification_disconnect" msgid="6183754463561153372">"Verbindung trennen"</string>
     <string name="kg_emergency_call_label" msgid="684946192523830531">"Notruf"</string>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 800da21..968aba9 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 95dec80..a37c945 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"Net Meeting"</string>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 8fe234d..a39e61f 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index 67a6755..8b666d8 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo!"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml
index 013a2eb..92a1e93 100644
--- a/core/res/res/values-et/strings.xml
+++ b/core/res/res/values-et/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 97b430e..459e1c3 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index 25336b0..9740070 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 88033d2..a1c795f 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index fa09220..a2180a8 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google टॉक"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index ef9b50a..733a0e3 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index 4c87604..dab89414 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Csevegő"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 39106ad..5f122e6 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index 14e346f..416c534 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index cc70005..7afb72c 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 99778a0..340774c 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Googleトーク"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index a97bf9b..73cdb1c 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google 토크"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 2bde748..593316f 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"„Google“ pokalbiai"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"„Jabber“"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index 4cca123..11e0116 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index 06548c6..4a0017f 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Bual Google"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index b339738e..614b685 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"OQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index 358dfe3..bbdfed3a 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index d3b340b..e4e82f9 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index 32d3692..e5c48bb 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index 2cd31a8..f0f3d60 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml
index 361b18a..cad9d1a 100644
--- a/core/res/res/values-rm/strings.xml
+++ b/core/res/res/values-rm/strings.xml
@@ -1186,7 +1186,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 4694e15..14f9644 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index 1b9b7504..81366f3 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 03e18be..b7dcd07 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index 40ee9f1..11dc13d 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index 0965b46..d0ebddd 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index 0df55b9..80ab2ae6 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index f14c90d..b066d3a 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -207,7 +207,7 @@
     <string name="permgrouplab_wallpaper" msgid="3850280158041175998">"Taswira"</string>
     <string name="permgroupdesc_wallpaper" msgid="5630417854750540154">"Badilisha mipangilio taswira ya kifaa."</string>
     <string name="permgrouplab_systemClock" msgid="406535759236612992">"Saa"</string>
-    <string name="permgroupdesc_systemClock" msgid="3944359833624094992">"Badilisha muda wa kifaa au ukanda wa saa."</string>
+    <string name="permgroupdesc_systemClock" msgid="3944359833624094992">"Badilisha saa za kifaa au za eneo."</string>
     <string name="permgrouplab_statusBar" msgid="2095862568113945398">"Hali Upau"</string>
     <string name="permgroupdesc_statusBar" msgid="6242593432226807171">"Badilisha mipangilio ya upau wa hali ya kifaa."</string>
     <string name="permgrouplab_syncSettings" msgid="3341990986147826541">"Mipangilio ya Upatanishi"</string>
@@ -541,7 +541,7 @@
     <string name="permlab_setTime" msgid="2021614829591775646">"weka muda"</string>
     <string name="permdesc_setTime" product="tablet" msgid="1896341438151152881">"Inaruhusu programu kubadilisha wakati wa saa ya kompyuta kibao."</string>
     <string name="permdesc_setTime" product="default" msgid="1855702730738020">"Inaruhusu programu kubadilisha wakati wa saa ya simu."</string>
-    <string name="permlab_setTimeZone" msgid="2945079801013077340">"weka ukanda wa saa"</string>
+    <string name="permlab_setTimeZone" msgid="2945079801013077340">"weka saa za eneo"</string>
     <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Inaruhusu programu kubadilisha  majira ya saa ya kompyuta kibao."</string>
     <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"Inaruhusu programu kubadilisha  majira ya saa ya simu."</string>
     <string name="permlab_accountManagerService" msgid="4829262349691386986">"tenda kama Huduma ya Meneja wa Akaunti"</string>
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
@@ -793,8 +794,8 @@
     <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Hakuna SIM kadi katika kompyuta ndogo."</string>
     <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Hakuna SIM kadi kwenye simu."</string>
     <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"Ingiza SIM kadi."</string>
-    <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"Kadi ya SIM haiko au haisomeki. Tafadhali ingiza SIM kadi."</string>
-    <string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Kadi ya SIM isiyotumika."</string>
+    <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM kadi haipatikani au haisomeki. Tafadhali ingiza SIM kadi."</string>
+    <string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"SIM kadi isiyotumika."</string>
     <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"SIM kadi yako imelemezwa kabisa."\n" Wasiliana na mtoa huduma wako wa pasi waya ili upate SIM kadi nyingine."</string>
     <string name="lockscreen_transport_prev_description" msgid="201594905152746886">"Kitufe cha awali cha wimbo"</string>
     <string name="lockscreen_transport_next_description" msgid="6089297650481292363">"Kitufe cha wimbo unaofuata"</string>
@@ -803,9 +804,9 @@
     <string name="lockscreen_transport_stop_description" msgid="4562318378766987601">"Kitufe cha kusitisha"</string>
     <string name="emergency_calls_only" msgid="6733978304386365407">"Simu za dharura pekee"</string>
     <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Mtandao umefungwa"</string>
-    <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"Kadi ya SIM imefungwa na PUK."</string>
+    <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM kadi imefungwa kwa PUK."</string>
     <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"Angalia Mwongozo wa Mtumiaji au wasiliana na Huduma ya Wateja."</string>
-    <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"Kadi ya SIM imefungwa."</string>
+    <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM kadi imefungwa."</string>
     <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Inafungua SIM kadi..."</string>
     <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"Umekosea katika kuchora ruwaza yako ya kufungua mara <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n" Jaribu tena kwa sekunde <xliff:g id="NUMBER_1">%d</xliff:g>."</string>
     <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"Umekosea mara <xliff:g id="NUMBER_0">%d</xliff:g> katika kuingiza nenosiri lako. "\n\n" Jaribu tena katika sekunde <xliff:g id="NUMBER_1">%d</xliff:g>."</string>
@@ -869,7 +870,7 @@
     <string name="factorytest_no_action" msgid="872991874799998561">"Hakuna furushi lililopatikana ambalo linatoa tendo la JARIBIO_LA KIWANDA."</string>
     <string name="factorytest_reboot" msgid="6320168203050791643">"Washa tena"</string>
     <string name="js_dialog_title" msgid="1987483977834603872">"Ukurasa wa \"<xliff:g id="TITLE">%s</xliff:g>\" unasema:"</string>
-    <string name="js_dialog_title_default" msgid="6961903213729667573">"HatiJava"</string>
+    <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string>
     <string name="js_dialog_before_unload_title" msgid="2619376555525116593">"Thibitisha jinsi ya kuelekea"</string>
     <string name="js_dialog_before_unload_positive_button" msgid="3112752010600484130">"Toka kwenye Ukurasa huu"</string>
     <string name="js_dialog_before_unload_negative_button" msgid="5614861293026099715">"Bakia kwenye Ukurasa huu"</string>
@@ -1170,10 +1171,10 @@
     <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Unaweza kubadilisha hii baadaye kwenye Mipangilio &gt; Programu"</string>
     <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Ruhusu Kila mara"</string>
     <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Usiruhusu Kamwe"</string>
-    <string name="sim_removed_title" msgid="6227712319223226185">"Kadi ya SIM imeondolewa"</string>
+    <string name="sim_removed_title" msgid="6227712319223226185">"SIM kadi imeondolewa"</string>
     <string name="sim_removed_message" msgid="2333164559970958645">"mtandao wa simu hutapatika hadi uanzishe upya na SIM kadi halali iliyoingizwa."</string>
     <string name="sim_done_button" msgid="827949989369963775">"Kwisha"</string>
-    <string name="sim_added_title" msgid="3719670512889674693">"Kadi ya SIM imeongezwa"</string>
+    <string name="sim_added_title" msgid="3719670512889674693">"SIM kadi imeongezwa"</string>
     <string name="sim_added_message" msgid="6599945301141050216">"Anzisha upya kifaa chako ili kufikia mtandao wa simu."</string>
     <string name="sim_restart_button" msgid="4722407842815232347">"Anza upya"</string>
     <string name="time_picker_dialog_title" msgid="8349362623068819295">"Weka muda"</string>
@@ -1460,7 +1461,7 @@
     <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM sasa imelemazwa. Ingiza msimbo wa PUK ili kuendelea. Wasiliana na mtoa huduma kwa maelezo."</string>
     <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Ingiza msimbo wa PIN unaopendelewa"</string>
     <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Thibitisha msimbo wa PIN unaopendelewa"</string>
-    <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Inafungua kadi ya SIM..."</string>
+    <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Inafungua SIM kadi..."</string>
     <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Msimbo wa PIN usio sahihi."</string>
     <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Charaza PIN iliyo na tarakimu kati ya 4 na 8."</string>
     <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Msimbo wa PUK unafaa kuwa na nambari 8 au zaidi."</string>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index 3010f0d..3825b40 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index c64de9a..401fa42 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index 5813d4e..a6d7b2a 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index 8a89a20..d2798ad 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index 57fe95a..d4d17a6 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index d8f8a8b..2c23f8f 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"雅虎"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index 8b908d7..6bf2bf9 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Google Talk"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"網路會議"</string>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index f2e6d5e..28cefb8 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -738,7 +738,8 @@
     <string name="imProtocolYahoo" msgid="8271439408469021273">"i-Yahoo"</string>
     <string name="imProtocolSkype" msgid="9019296744622832951">"i-Skype"</string>
     <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string>
-    <string name="imProtocolGoogleTalk" msgid="3808393979157698766">"Ingxoxo ye-Google"</string>
+    <!-- no translation found for imProtocolGoogleTalk (493902321140277304) -->
+    <skip />
     <string name="imProtocolIcq" msgid="1574870433606517315">"i-ICQ"</string>
     <string name="imProtocolJabber" msgid="2279917630875771722">"i-Jabber"</string>
     <string name="imProtocolNetMeeting" msgid="8287625655986827971">"Umhlangano we-Net"</string>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4bd1c9b..4572f5b 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -772,6 +772,15 @@
     <!-- IP address of the dns server to use if nobody else suggests one -->
     <string name="config_default_dns_server" translatable="false">8.8.8.8</string>
 
+    <!-- The default mobile provisioning url. Empty by default, maybe overridden by
+         an mcc/mnc specific config.xml -->
+    <string name="mobile_provisioning_url" translatable="false"></string>
+
+    <!-- This url is used as the default url when redirection is detected. Any
+         should work as all url's get redirected. But maybe overridden by
+         if needed. -->
+    <string name="mobile_redirected_provisioning_url" translatable="false">http://google.com</string>
+
     <!-- The default character set for GsmAlphabet -->
     <!-- Empty string means MBCS is not considered -->
     <string name="gsm_alphabet_default_charset" translatable="false"></string>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 3ecdc0c..b885d56 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -703,6 +703,8 @@
   <java-symbol type="string" name="preposition_for_time" />
   <java-symbol type="string" name="progress_erasing" />
   <java-symbol type="string" name="progress_unmounting" />
+  <java-symbol type="string" name="mobile_provisioning_url" />
+  <java-symbol type="string" name="mobile_redirected_provisioning_url" />
   <java-symbol type="string" name="reboot_safemode_confirm" />
   <java-symbol type="string" name="reboot_safemode_title" />
   <java-symbol type="string" name="relationTypeAssistant" />
diff --git a/docs/html/tools/help/uiautomator/Configurator.jd b/docs/html/tools/help/uiautomator/Configurator.jd
new file mode 100644
index 0000000..c898772
--- /dev/null
+++ b/docs/html/tools/help/uiautomator/Configurator.jd
@@ -0,0 +1,960 @@
+page.title=Configurator
+parent.title=uiautomator
+parent.link=index.html
+
+@jd:body
+<style>
+    h4.jd-details-title {background-color: #DEE8F1;}
+</style>
+
+<div id="api-info-block">
+<div class="api-level" style="margin:-95px 0 0;">
+Since <a href="/guide/topics/manifest/uses-sdk-element.html#ApiLevels">API level 18</a>
+</div>
+</div>
+
+<p>Allows you to set key parameters for running uiautomator tests. The new
+settings take effect immediately and can be changed any time during a test run.
+To modify parameters using <code><a href="#">Configurator</a></code>, first
+obtain an instance by calling <code><a href="#getInstance()">getInstance()</a></code>.
+As a best practice, make sure you always save the original value of any
+parameter that you are modifying. After running your tests with the modified
+parameters, make sure to also restore the original parameter values, otherwise
+this will impact other tests cases.</p>
+
+
+<h2>Summary</h2>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<!-- ========== METHOD SUMMARY =========== -->
+<table id="pubmethods" class="jd-sumtable"><tr><th colspan="12">Public Methods</th></tr>
+
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            long</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getActionAcknowledgmentTimeout()">getActionAcknowledgmentTimeout</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Gets the current timeout for waiting for an acknowledgment of generic
+ uiautomator actions, such as clicks, text setting, and menu presses.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+            static
+
+            <a href="#">Configurator</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getInstance()">getInstance</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Retrieves a singleton instance of Configurator.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            long</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getKeyInjectionDelay()">getKeyInjectionDelay</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Gets the current delay between key presses when injecting text input.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            long</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getScrollAcknowledgmentTimeout()">getScrollAcknowledgmentTimeout</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Gets the timeout for waiting for an acknowledgement of an
+ uiautomtor scroll swipe action.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            long</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getWaitForIdleTimeout()">getWaitForIdleTimeout</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Gets the current timeout used for waiting for the user interface to go
+ into an idle state.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            long</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getWaitForSelectorTimeout()">getWaitForSelectorTimeout</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Gets the current timeout for waiting for a widget to become visible in
+ the user interface so that it can be matched by a selector.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">Configurator</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setActionAcknowledgmentTimeout(long)">setActionAcknowledgmentTimeout</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Sets the timeout for waiting for an acknowledgment of generic uiautomator
+ actions, such as clicks, text setting, and menu presses.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">Configurator</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setKeyInjectionDelay(long)">setKeyInjectionDelay</a></span>(long delay)</nobr>
+
+        <div class="jd-descrdiv">Sets a delay between key presses when injecting text input.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">Configurator</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setScrollAcknowledgmentTimeout(long)">setScrollAcknowledgmentTimeout</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Sets the timeout for waiting for an acknowledgement of an
+ uiautomtor scroll swipe action.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">Configurator</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setWaitForIdleTimeout(long)">setWaitForIdleTimeout</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Sets the timeout for waiting for the user interface to go into an idle
+ state before starting a uiautomator action.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">Configurator</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setWaitForSelectorTimeout(long)">setWaitForSelectorTimeout</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Sets the timeout for waiting for a widget to become visible in the user
+ interface so that it can be matched by a selector.</div>
+
+  </td></tr>
+
+
+
+</table>
+
+
+
+
+
+
+
+<!-- ========== METHOD SUMMARY =========== -->
+<table id="inhmethods" class="jd-sumtable"><tr><th>
+  <a href="#" class="toggle-all" onclick="return toggleAllInherited(this, null)">[Expand]</a>
+  <div style="clear:left;">Inherited Methods</div></th></tr>
+
+
+<tr class="api" >
+<td colspan="12">
+  <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-java.lang.Object" class="jd-expando-trigger closed"
+          ><img id="inherited-methods-java.lang.Object-trigger"
+          src="../../../../../assets/images/triangle-closed.png"
+          class="jd-expando-trigger-img" /></a>
+From class
+
+  java.lang.Object
+
+<div id="inherited-methods-java.lang.Object">
+  <div id="inherited-methods-java.lang.Object-list"
+        class="jd-inheritedlinks">
+  </div>
+  <div id="inherited-methods-java.lang.Object-summary" style="display: none;">
+    <table class="jd-sumtable-expando">
+
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Object</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">clone</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">equals</span>(Object arg0)</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">finalize</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+            final
+
+
+            Class&lt;?&gt;</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">getClass</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">hashCode</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+            final
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notify</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+            final
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notifyAll</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">toString</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+            final
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+            final
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0, int arg1)</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+            final
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0)</nobr>
+
+  </td></tr>
+
+
+</table>
+  </div>
+</div>
+</td></tr>
+
+
+</table>
+
+
+</div><!-- jd-descr (summary) -->
+
+<!-- Details -->
+
+
+
+
+
+
+
+
+<!-- XML Attributes -->
+
+
+<!-- Enum Values -->
+
+
+<!-- Constants -->
+
+
+<!-- Fields -->
+
+
+<!-- Public ctors -->
+
+
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<!-- Protected ctors -->
+
+
+
+<!-- ========= METHOD DETAIL ======== -->
+<!-- Public methdos -->
+
+<h2>Public Methods</h2>
+
+
+
+<A NAME="getActionAcknowledgmentTimeout()"></A>
+
+<div class="jd-details api apilevel-18">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        long
+      </span>
+      <span class="sympad">getActionAcknowledgmentTimeout</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Gets the current timeout for waiting for an acknowledgment of generic
+ uiautomator actions, such as clicks, text setting, and menu presses.
+
+ The acknowledgment is an <a href="http://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html">AccessibilityEvent</a>,
+ corresponding to an action, that lets the framework determine if the
+ action was successful. Generally, this timeout should not be modified.
+ See <code><a href="UiObject.html">UiObject</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>current timeout in milliseconds</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+
+    </div>
+</div>
+
+
+<A NAME="getInstance()"></A>
+
+<div class="jd-details api apilevel-18">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+        static
+
+
+
+        <a href="#">Configurator</a>
+      </span>
+      <span class="sympad">getInstance</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Retrieves a singleton instance of Configurator.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>Configurator instance</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+
+    </div>
+</div>
+
+
+<A NAME="getKeyInjectionDelay()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        long
+      </span>
+      <span class="sympad">getKeyInjectionDelay</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Gets the current delay between key presses when injecting text input.
+ See <code><a href="UiObject.html#setText(java.lang.String)">setText(String)</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>current delay in milliseconds</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="getScrollAcknowledgmentTimeout()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        long
+      </span>
+      <span class="sympad">getScrollAcknowledgmentTimeout</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Gets the timeout for waiting for an acknowledgement of an
+ uiautomtor scroll swipe action.
+
+ The acknowledgment is an <a href="http://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html">AccessibilityEvent</a>,
+ corresponding to the scroll action, that lets the framework determine if
+ the scroll action was successful. Generally, this timeout should not be modified.
+ See <code><a href="UiScrollable.html">UiScrollable</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>current timeout in milliseconds</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="getWaitForIdleTimeout()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        long
+      </span>
+      <span class="sympad">getWaitForIdleTimeout</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Gets the current timeout used for waiting for the user interface to go
+ into an idle state.
+
+ By default, all core uiautomator objects except <code><a href="UiDevice.html">UiDevice</a></code> will perform
+ this wait before starting to search for the widget specified by the
+ object's <code><a href="UiSelector.html">UiSelector</a></code>. Once the idle state is detected or the
+ timeout elapses (whichever occurs first), the object will start to wait
+ for the selector to find a match.
+ See <code><a href="#setWaitForSelectorTimeout(long)">setWaitForSelectorTimeout(long)</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>Current timeout value in milliseconds</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="getWaitForSelectorTimeout()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        long
+      </span>
+      <span class="sympad">getWaitForSelectorTimeout</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Gets the current timeout for waiting for a widget to become visible in
+ the user interface so that it can be matched by a selector.
+
+ Because user interface content is dynamic, sometimes a widget may not
+ be visible immediately and won't be detected by a selector. This timeout
+ allows the uiautomator framework to wait for a match to be found, up until
+ the timeout elapses.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>Current timeout value in milliseconds</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setActionAcknowledgmentTimeout(long)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">Configurator</a>
+      </span>
+      <span class="sympad">setActionAcknowledgmentTimeout</span>
+      <span class="normal">(long timeout)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Sets the timeout for waiting for an acknowledgment of generic uiautomator
+ actions, such as clicks, text setting, and menu presses.
+
+ The acknowledgment is an <a href="http://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html">AccessibilityEvent</a>,
+ corresponding to an action, that lets the framework determine if the
+ action was successful. Generally, this timeout should not be modified.
+ See <code><a href="UiObject.html">UiObject</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>timeout</td>
+          <td>Timeout value in milliseconds</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>self</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setKeyInjectionDelay(long)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">Configurator</a>
+      </span>
+      <span class="sympad">setKeyInjectionDelay</span>
+      <span class="normal">(long delay)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Sets a delay between key presses when injecting text input.
+ See <code><a href="UiObject.html#setText(java.lang.String)">setText(String)</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>delay</td>
+          <td>Delay value in milliseconds</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>self</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setScrollAcknowledgmentTimeout(long)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">Configurator</a>
+      </span>
+      <span class="sympad">setScrollAcknowledgmentTimeout</span>
+      <span class="normal">(long timeout)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Sets the timeout for waiting for an acknowledgement of an
+ uiautomtor scroll swipe action.
+
+ The acknowledgment is an <a href="http://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html">AccessibilityEvent</a>,
+ corresponding to the scroll action, that lets the framework determine if
+ the scroll action was successful. Generally, this timeout should not be modified.
+ See <code><a href="UiScrollable.html">UiScrollable</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>timeout</td>
+          <td>Timeout value in milliseconds</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>self</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setWaitForIdleTimeout(long)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">Configurator</a>
+      </span>
+      <span class="sympad">setWaitForIdleTimeout</span>
+      <span class="normal">(long timeout)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Sets the timeout for waiting for the user interface to go into an idle
+ state before starting a uiautomator action.
+
+ By default, all core uiautomator objects except <code><a href="UiDevice.html">UiDevice</a></code> will perform
+ this wait before starting to search for the widget specified by the
+ object's <code><a href="UiSelector.html">UiSelector</a></code>. Once the idle state is detected or the
+ timeout elapses (whichever occurs first), the object will start to wait
+ for the selector to find a match.
+ See <code><a href="#setWaitForSelectorTimeout(long)">setWaitForSelectorTimeout(long)</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>timeout</td>
+          <td>Timeout value in milliseconds</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>self</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setWaitForSelectorTimeout(long)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">Configurator</a>
+      </span>
+      <span class="sympad">setWaitForSelectorTimeout</span>
+      <span class="normal">(long timeout)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Sets the timeout for waiting for a widget to become visible in the user
+ interface so that it can be matched by a selector.
+
+ Because user interface content is dynamic, sometimes a widget may not
+ be visible immediately and won't be detected by a selector. This timeout
+ allows the uiautomator framework to wait for a match to be found, up until
+ the timeout elapses.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>timeout</td>
+          <td>Timeout value in milliseconds.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>self</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+
+
+
+
+
+<!-- ========= METHOD DETAIL ======== -->
+
+
+
+
diff --git a/docs/html/tools/help/uiautomator/IAutomationSupport.jd b/docs/html/tools/help/uiautomator/IAutomationSupport.jd
index 4120f2b..1e9e301 100644
--- a/docs/html/tools/help/uiautomator/IAutomationSupport.jd
+++ b/docs/html/tools/help/uiautomator/IAutomationSupport.jd
@@ -11,58 +11,8 @@
 
 </p>
 
-
-
-
-
-</div><!-- jd-descr -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="jd-descr">
-
-
 <h2>Summary</h2>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 <!-- ========== METHOD SUMMARY =========== -->
 <table id="pubmethods" class="jd-sumtable"><tr><th colspan="12">Public Methods</th></tr>
 
@@ -97,31 +47,6 @@
 
 </div><!-- jd-descr (summary) -->
 
-<!-- Details -->
-
-
-
-
-
-
-
-
-<!-- XML Attributes -->
-
-
-<!-- Enum Values -->
-
-
-<!-- Constants -->
-
-
-<!-- Fields -->
-
-
-<!-- Public ctors -->
-
-
-
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <!-- Protected ctors -->
 
@@ -149,20 +74,9 @@
       <span class="sympad">sendStatus</span>
       <span class="normal">(int resultCode, Bundle status)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
 </div>
         
-  
-
-      </div>
-    <div class="jd-details-descr">
-      
+<div class="jd-details-descr">
   <div class="jd-tagdata jd-tagdescr"><p>Allows the running test cases to send out interim status</p></div>
-
-    </div>
 </div>
 
-
-
diff --git a/docs/html/tools/help/uiautomator/UiAutomatorTestCase.jd b/docs/html/tools/help/uiautomator/UiAutomatorTestCase.jd
index 48c63ba..0d8d1bc 100644
--- a/docs/html/tools/help/uiautomator/UiAutomatorTestCase.jd
+++ b/docs/html/tools/help/uiautomator/UiAutomatorTestCase.jd
@@ -14,27 +14,6 @@
 </ul>
 </p>
 
-
-
-
-
-</div><!-- jd-descr -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 <div class="jd-descr">
 
 
diff --git a/docs/html/tools/help/uiautomator/UiCollection.jd b/docs/html/tools/help/uiautomator/UiCollection.jd
index ed92ca7..3fc32b7 100644
--- a/docs/html/tools/help/uiautomator/UiCollection.jd
+++ b/docs/html/tools/help/uiautomator/UiCollection.jd
@@ -9,8 +9,6 @@
  or targeting a sub elements by a child's text or description.
 </p>
 
-<div class="jd-descr">
-
 
 <h2>Summary</h2>
 
@@ -1267,5 +1265,4 @@
   </div>
 
     </div>
-</div>
 
diff --git a/docs/html/tools/help/uiautomator/UiDevice.jd b/docs/html/tools/help/uiautomator/UiDevice.jd
index 1c8805b..574245e 100644
--- a/docs/html/tools/help/uiautomator/UiDevice.jd
+++ b/docs/html/tools/help/uiautomator/UiDevice.jd
@@ -5,35 +5,9 @@
 <style>
     h4.jd-details-title {background-color: #DEE8F1;}
 </style>
-
-<h2>Class Overview</h2>
-<p>UiDevice provides access to state information about the device.
- You can also use this class to simulate user actions on the device,
- such as pressing the d-pad or pressing the Home and Menu buttons.</p>
-
-
-
-
-
-</div><!-- jd-descr -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="jd-descr">
-
+<p>Provides access to state information about the device. You can
+also use this class to simulate user actions on the device, such as pressing
+the d-pad or pressing the Home and Menu buttons.</p>
 
 <h2>Summary</h2>
 
@@ -68,866 +42,957 @@
 
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clearLastTraversedText()">clearLastTraversedText</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clearLastTraversedText()">clearLastTraversedText</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clears the text from the last UI traversal event.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#click(int, int)">click</a></span>(int x, int y)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#click(int, int)">click</a></span>(int x, int y)</nobr>
+
         <div class="jd-descrdiv">Perform a click at arbitrary coordinates specified by the user</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#dumpWindowHierarchy(java.lang.String)">dumpWindowHierarchy</a></span>(String fileName)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#drag(int, int, int, int, int)">drag</a></span>(int startX, int startY, int endX, int endY, int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a swipe from one coordinate to another coordinate.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#dumpWindowHierarchy(java.lang.String)">dumpWindowHierarchy</a></span>(String fileName)</nobr>
+
         <div class="jd-descrdiv">Helper method used for debugging to dump the current window's layout hierarchy.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#freezeRotation()">freezeRotation</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#freezeRotation()">freezeRotation</a></span>()</nobr>
+
         <div class="jd-descrdiv">Disables the sensors and freezes the device rotation at its
  current rotation state.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getCurrentActivityName()">getCurrentActivityName</a></span>()
-        
-        <div class="jd-descrdiv">
-      <em>
-  This method is deprecated.
-      The results returned should be considered unreliable</em></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getCurrentActivityName()">getCurrentActivityName</a></span>()</nobr>
+
+        <div class="jd-descrdiv"><em>
+      This method is deprecated.
+    The results returned should be considered unreliable</em></div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getCurrentPackageName()">getCurrentPackageName</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getCurrentPackageName()">getCurrentPackageName</a></span>()</nobr>
+
         <div class="jd-descrdiv">Retrieves the name of the last package to report accessibility events.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getDisplayHeight()">getDisplayHeight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getDisplayHeight()">getDisplayHeight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Gets the height of the display, in pixels.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getDisplayRotation()">getDisplayRotation</a></span>()
-        
-        <div class="jd-descrdiv">Returns the current rotation of the display, as defined in Surface@return</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getDisplayRotation()">getDisplayRotation</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the current rotation of the display, as defined in <code><a href="../../../../../reference/android/view/Surface.html">Surface</a></code></div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Point</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getDisplayWidth()">getDisplayWidth</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getDisplaySizeDp()">getDisplaySizeDp</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the display size in dp (device-independent pixel)
+
+ The returned display size is adjusted per screen rotation.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getDisplayWidth()">getDisplayWidth</a></span>()</nobr>
+
         <div class="jd-descrdiv">Gets the width of the display, in pixels.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
             static
-            
-            <a href="UiDevice.html">UiDevice</a>
+
+            <a href="#">UiDevice</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getInstance()">getInstance</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getInstance()">getInstance</a></span>()</nobr>
+
         <div class="jd-descrdiv">Retrieves a singleton instance of UiDevice</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getLastTraversedText()">getLastTraversedText</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getLastTraversedText()">getLastTraversedText</a></span>()</nobr>
+
         <div class="jd-descrdiv">Retrieves the text from the last UI traversal event received.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getProductName()">getProductName</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getProductName()">getProductName</a></span>()</nobr>
+
         <div class="jd-descrdiv">Retrieves the product name of the device.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#hasAnyWatcherTriggered()">hasAnyWatcherTriggered</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#hasAnyWatcherTriggered()">hasAnyWatcherTriggered</a></span>()</nobr>
+
         <div class="jd-descrdiv">Checks if any registered <code><a href="UiWatcher.html">UiWatcher</a></code> have triggered.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#hasWatcherTriggered(java.lang.String)">hasWatcherTriggered</a></span>(String watcherName)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#hasWatcherTriggered(java.lang.String)">hasWatcherTriggered</a></span>(String watcherName)</nobr>
+
         <div class="jd-descrdiv">Checks if a specific registered  <code><a href="UiWatcher.html">UiWatcher</a></code> has triggered.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isNaturalOrientation()">isNaturalOrientation</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isNaturalOrientation()">isNaturalOrientation</a></span>()</nobr>
+
         <div class="jd-descrdiv">Check if the device is in its natural orientation.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isScreenOn()">isScreenOn</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isScreenOn()">isScreenOn</a></span>()</nobr>
+
         <div class="jd-descrdiv">Checks the power manager if the screen is ON.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressBack()">pressBack</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#openNotification()">openNotification</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Opens the notification shade.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#openQuickSettings()">openQuickSettings</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Opens the Quick Settings shade.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressBack()">pressBack</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the BACK button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressDPadCenter()">pressDPadCenter</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressDPadCenter()">pressDPadCenter</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the CENTER button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressDPadDown()">pressDPadDown</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressDPadDown()">pressDPadDown</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the DOWN button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressDPadLeft()">pressDPadLeft</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressDPadLeft()">pressDPadLeft</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the LEFT button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressDPadRight()">pressDPadRight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressDPadRight()">pressDPadRight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the RIGHT button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressDPadUp()">pressDPadUp</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressDPadUp()">pressDPadUp</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the UP button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressDelete()">pressDelete</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressDelete()">pressDelete</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the DELETE key.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressEnter()">pressEnter</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressEnter()">pressEnter</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the ENTER key.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressHome()">pressHome</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressHome()">pressHome</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the HOME button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressKeyCode(int)">pressKeyCode</a></span>(int keyCode)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressKeyCode(int, int)">pressKeyCode</a></span>(int keyCode, int metaState)</nobr>
+
         <div class="jd-descrdiv">Simulates a short press using a key code.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressKeyCode(int, int)">pressKeyCode</a></span>(int keyCode, int metaState)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressKeyCode(int)">pressKeyCode</a></span>(int keyCode)</nobr>
+
         <div class="jd-descrdiv">Simulates a short press using a key code.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressMenu()">pressMenu</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressMenu()">pressMenu</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the MENU button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressRecentApps()">pressRecentApps</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressRecentApps()">pressRecentApps</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the Recent Apps button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#pressSearch()">pressSearch</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pressSearch()">pressSearch</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates a short press on the SEARCH button.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">registerWatcher</a></span>(String name, <a href="UiWatcher.html">UiWatcher</a> watcher)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">registerWatcher</a></span>(String name, <a href="UiWatcher.html">UiWatcher</a> watcher)</nobr>
+
         <div class="jd-descrdiv">Registers a <code><a href="UiWatcher.html">UiWatcher</a></code> to run automatically when the testing framework is unable to
  find a match using a <code><a href="UiSelector.html">UiSelector</a></code>.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#removeWatcher(java.lang.String)">removeWatcher</a></span>(String name)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#removeWatcher(java.lang.String)">removeWatcher</a></span>(String name)</nobr>
+
         <div class="jd-descrdiv">Removes a previously registered <code><a href="UiWatcher.html">UiWatcher</a></code>.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#resetWatcherTriggers()">resetWatcherTriggers</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#resetWatcherTriggers()">resetWatcherTriggers</a></span>()</nobr>
+
         <div class="jd-descrdiv">Resets a <code><a href="UiWatcher.html">UiWatcher</a></code> that has been triggered.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#runWatchers()">runWatchers</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#runWatchers()">runWatchers</a></span>()</nobr>
+
         <div class="jd-descrdiv">This method forces all registered watchers to run.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setOrientationLeft()">setOrientationLeft</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setCompressedLayoutHeirarchy(boolean)">setCompressedLayoutHeirarchy</a></span>(boolean compressed)</nobr>
+
+        <div class="jd-descrdiv">Enables or disables layout hierarchy compression.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setOrientationLeft()">setOrientationLeft</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates orienting the device to the left and also freezes rotation
  by disabling the sensors.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setOrientationNatural()">setOrientationNatural</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setOrientationNatural()">setOrientationNatural</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates orienting the device into its natural orientation and also freezes rotation
  by disabling the sensors.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setOrientationRight()">setOrientationRight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setOrientationRight()">setOrientationRight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Simulates orienting the device to the right and also freezes rotation
  by disabling the sensors.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#sleep()">sleep</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#sleep()">sleep</a></span>()</nobr>
+
         <div class="jd-descrdiv">This method simply presses the power button if the screen is ON else
  it does nothing if the screen is already OFF.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#swipe(android.graphics.Point[], int)">swipe</a></span>(Point[] segments, int segmentSteps)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#swipe(android.graphics.Point[], int)">swipe</a></span>(Point[] segments, int segmentSteps)</nobr>
+
         <div class="jd-descrdiv">Performs a swipe between points in the Point array.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#swipe(int, int, int, int, int)">swipe</a></span>(int startX, int startY, int endX, int endY, int steps)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#swipe(int, int, int, int, int)">swipe</a></span>(int startX, int startY, int endX, int endY, int steps)</nobr>
+
         <div class="jd-descrdiv">Performs a swipe from one coordinate to another using the number of steps
  to determine smoothness and speed.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#takeScreenshot(java.io.File, float, int)">takeScreenshot</a></span>(File storePath, float scale, int quality)
-        
-        <div class="jd-descrdiv">Take a screenshot of current window and store it as PNG
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#takeScreenshot(java.io.File)">takeScreenshot</a></span>(File storePath)</nobr>
 
- The screenshot is adjusted per screen rotation</div>
-  
-  </td></tr>
-
-
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
-        </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#takeScreenshot(java.io.File)">takeScreenshot</a></span>(File storePath)
-        
         <div class="jd-descrdiv">Take a screenshot of current window and store it as PNG
 
  Default scale of 1.0f (original size) and 90% quality is used
  The screenshot is adjusted per screen rotation</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#unfreezeRotation()">unfreezeRotation</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#takeScreenshot(java.io.File, float, int)">takeScreenshot</a></span>(File storePath, float scale, int quality)</nobr>
+
+        <div class="jd-descrdiv">Take a screenshot of current window and store it as PNG
+
+ The screenshot is adjusted per screen rotation</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#unfreezeRotation()">unfreezeRotation</a></span>()</nobr>
+
         <div class="jd-descrdiv">Re-enables the sensors and un-freezes the device rotation allowing its contents
  to rotate with the device physical rotation.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#waitForIdle(long)">waitForIdle</a></span>(long time)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#waitForIdle(long)">waitForIdle</a></span>(long timeout)</nobr>
+
         <div class="jd-descrdiv">Waits for the current application to idle.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#waitForIdle()">waitForIdle</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#waitForIdle()">waitForIdle</a></span>()</nobr>
+
         <div class="jd-descrdiv">Waits for the current application to idle.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#waitForWindowUpdate(java.lang.String, long)">waitForWindowUpdate</a></span>(String packageName, long timeout)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#waitForWindowUpdate(java.lang.String, long)">waitForWindowUpdate</a></span>(String packageName, long timeout)</nobr>
+
         <div class="jd-descrdiv">Waits for a window content update event to occur.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#wakeUp()">wakeUp</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#wakeUp()">wakeUp</a></span>()</nobr>
+
         <div class="jd-descrdiv">This method simulates pressing the power button if the screen is OFF else
  it does nothing if the screen is already ON.</div>
-  
+
   </td></tr>
 
 
@@ -946,7 +1011,7 @@
   <div style="clear:left;">Inherited Methods</div></th></tr>
 
 
-<tr class="api apilevel-" >
+<tr class="api" >
 <td colspan="12">
   <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-java.lang.Object" class="jd-expando-trigger closed"
           ><img id="inherited-methods-java.lang.Object-trigger"
@@ -962,150 +1027,182 @@
   </div>
   <div id="inherited-methods-java.lang.Object-summary" style="display: none;">
     <table class="jd-sumtable-expando">
-    
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Object</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">equals</span>(Object arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">clone</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">equals</span>(Object arg0)</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">finalize</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            Class&lt;?&gt;
+
+
+            Class&lt;?&gt;</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">getClass</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">getClass</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">hashCode</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">hashCode</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notify</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notify</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notifyAll</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notifyAll</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">toString</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">toString</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0, int arg1)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0, int arg1)</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0)</nobr>
+
   </td></tr>
 
 
@@ -1157,31 +1254,29 @@
 
 
 
-<a id="clearLastTraversedText()"></a>
+<A NAME="clearLastTraversedText()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">clearLastTraversedText</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Clears the text from the last UI traversal event.
  See <code><a href="#getLastTraversedText()">getLastTraversedText()</a></code>.</p></div>
 
@@ -1189,41 +1284,39 @@
 </div>
 
 
-<a id="click(int, int)"></a>
+<A NAME="click(int, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">click</span>
       <span class="normal">(int x, int y)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Perform a click at arbitrary coordinates specified by the user</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>x</th>
+          <th>x</td>
           <td>coordinate</td>
         </tr>
         <tr>
-          <th>y</th>
+          <th>y</td>
           <td>coordinate</td>
         </tr>
       </table>
@@ -1237,31 +1330,88 @@
 </div>
 
 
-<a id="dumpWindowHierarchy(java.lang.String)"></a>
+<A NAME="drag(int, int, int, int, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api apilevel-18">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">drag</span>
+      <span class="normal">(int startX, int startY, int endX, int endY, int steps)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a swipe from one coordinate to another coordinate. You can control
+ the smoothness and speed of the swipe by specifying the number of steps.
+ Each step execution is throttled to 5 milliseconds per step, so for a 100
+ steps, the swipe will take around 0.5 seconds to complete.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>startX</td>
+          <td>X-axis value for the starting coordinate</td>
+        </tr>
+        <tr>
+          <th>startY</td>
+          <td>Y-axis value for the starting coordinate</td>
+        </tr>
+        <tr>
+          <th>endX</td>
+          <td>X-axis value for the ending coordinate</td>
+        </tr>
+        <tr>
+          <th>endY</td>
+          <td>Y-axis value for the ending coordinate</td>
+        </tr>
+        <tr>
+          <th>steps</td>
+          <td>is the number of steps for the swipe action</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if swipe is performed, false if the operation fails
+ or the coordinates are invalid</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="dumpWindowHierarchy(java.lang.String)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">dumpWindowHierarchy</span>
       <span class="normal">(String fileName)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Helper method used for debugging to dump the current window's layout hierarchy.
  The file root location is /data/local/tmp</p></div>
 
@@ -1269,40 +1419,38 @@
 </div>
 
 
-<a id="freezeRotation()"></a>
+<A NAME="freezeRotation()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">freezeRotation</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Disables the sensors and freezes the device rotation at its
  current rotation state.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -1314,34 +1462,32 @@
 </div>
 
 
-<a id="getCurrentActivityName()"></a>
+<A NAME="getCurrentActivityName()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getCurrentActivityName</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
       <p>
-  <p class="caution">
-      <strong>
-  This method is deprecated.</strong><br/> The results returned should be considered unreliable
+  <p class="caution"><strong>
+      This method is deprecated.</strong><br/>
+    The results returned should be considered unreliable
   </p>
   <div class="jd-tagdata jd-tagdescr"><p>Retrieves the last activity to report accessibility events.</p></div>
   <div class="jd-tagdata">
@@ -1353,31 +1499,29 @@
 </div>
 
 
-<a id="getCurrentPackageName()"></a>
+<A NAME="getCurrentPackageName()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getCurrentPackageName</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Retrieves the name of the last package to report accessibility events.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1388,31 +1532,29 @@
 </div>
 
 
-<a id="getDisplayHeight()"></a>
+<A NAME="getDisplayHeight()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         int
       </span>
       <span class="sympad">getDisplayHeight</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Gets the height of the display, in pixels. The size is adjusted based
  on the current orientation of the display.</p></div>
   <div class="jd-tagdata">
@@ -1424,65 +1566,84 @@
 </div>
 
 
-<a id="getDisplayRotation()"></a>
+<A NAME="getDisplayRotation()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         int
       </span>
       <span class="sympad">getDisplayRotation</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Returns the current rotation of the display, as defined in Surface@return</p></div>
-  <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Returns the current rotation of the display, as defined in <code><a href="../../../../../reference/android/view/Surface.html">Surface</a></code></p></div>
+
+    </div>
+    <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
 </div>
+
+
+<A NAME="getDisplaySizeDp()"></A>
+
+<div class="jd-details api apilevel-18">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        Point
+      </span>
+      <span class="sympad">getDisplaySizeDp</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Returns the display size in dp (device-independent pixel)
+
+ The returned display size is adjusted per screen rotation. Also this will return the actual
+ size of the screen, rather than adjusted per system decorations (like status bar).</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>a Point containing the display size in dp
+</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="getDisplayWidth()"></a>
+<A NAME="getDisplayWidth()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         int
       </span>
       <span class="sympad">getDisplayWidth</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Gets the width of the display, in pixels. The width and height details
  are reported based on the current orientation of the display.</p></div>
   <div class="jd-tagdata">
@@ -1494,31 +1655,23 @@
 </div>
 
 
-<a id="getInstance()"></a>
+<A NAME="getInstance()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-        static 
-         
-         
-         
-        <a href="UiDevice.html">UiDevice</a>
+        public
+        static
+
+
+
+        <a href="#">UiDevice</a>
       </span>
       <span class="sympad">getInstance</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Retrieves a singleton instance of UiDevice</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1529,31 +1682,29 @@
 </div>
 
 
-<a id="getLastTraversedText()"></a>
+<A NAME="getLastTraversedText()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getLastTraversedText</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Retrieves the text from the last UI traversal event received.
 
  You can use this method to read the contents in a WebView container
@@ -1573,31 +1724,23 @@
 </div>
 
 
-<a id="getProductName()"></a>
+<A NAME="getProductName()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api apilevel-17">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getProductName</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Retrieves the product name of the device.
 
  This method provides information on what type of device the test is running on. This value is
@@ -1607,38 +1750,36 @@
       <ul class="nolist"><li>product name of the device</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="hasAnyWatcherTriggered()"></a>
+<A NAME="hasAnyWatcherTriggered()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">hasAnyWatcherTriggered</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Checks if any registered <code><a href="UiWatcher.html">UiWatcher</a></code> have triggered.
 
  See <code><a href="#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">registerWatcher(String, UiWatcher)</a></code>
@@ -1648,31 +1789,29 @@
 </div>
 
 
-<a id="hasWatcherTriggered(java.lang.String)"></a>
+<A NAME="hasWatcherTriggered(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">hasWatcherTriggered</span>
       <span class="normal">(String watcherName)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Checks if a specific registered  <code><a href="UiWatcher.html">UiWatcher</a></code> has triggered.
  See <code><a href="#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">registerWatcher(String, UiWatcher)</a></code>. If a UiWatcher runs and its
  <code><a href="UiWatcher.html#checkForCondition()">checkForCondition()</a></code> call returned <code>true</code>, then
@@ -1687,31 +1826,23 @@
 </div>
 
 
-<a id="isNaturalOrientation()"></a>
+<A NAME="isNaturalOrientation()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isNaturalOrientation</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Check if the device is in its natural orientation. This is determined by checking if the
  orientation is at 0 or 180 degrees.</p></div>
   <div class="jd-tagdata">
@@ -1719,38 +1850,36 @@
       <ul class="nolist"><li>true if it is in natural orientation</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="isScreenOn()"></a>
+<A NAME="isScreenOn()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isScreenOn</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Checks the power manager if the screen is ON.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1758,11 +1887,11 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -1774,31 +1903,89 @@
 </div>
 
 
-<a id="pressBack()"></a>
+<A NAME="openNotification()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api apilevel-18">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">openNotification</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Opens the notification shade.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if successful, else return false</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="openQuickSettings()"></A>
+
+<div class="jd-details api apilevel-18">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">openQuickSettings</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Opens the Quick Settings shade.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if successful, else return false</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="pressBack()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressBack</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the BACK button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1809,31 +1996,29 @@
 </div>
 
 
-<a id="pressDPadCenter()"></a>
+<A NAME="pressDPadCenter()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressDPadCenter</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the CENTER button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1844,31 +2029,29 @@
 </div>
 
 
-<a id="pressDPadDown()"></a>
+<A NAME="pressDPadDown()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressDPadDown</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the DOWN button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1879,31 +2062,29 @@
 </div>
 
 
-<a id="pressDPadLeft()"></a>
+<A NAME="pressDPadLeft()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressDPadLeft</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the LEFT button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1914,31 +2095,29 @@
 </div>
 
 
-<a id="pressDPadRight()"></a>
+<A NAME="pressDPadRight()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressDPadRight</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the RIGHT button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1949,31 +2128,29 @@
 </div>
 
 
-<a id="pressDPadUp()"></a>
+<A NAME="pressDPadUp()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressDPadUp</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the UP button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1984,31 +2161,29 @@
 </div>
 
 
-<a id="pressDelete()"></a>
+<A NAME="pressDelete()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressDelete</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the DELETE key.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2019,31 +2194,29 @@
 </div>
 
 
-<a id="pressEnter()"></a>
+<A NAME="pressEnter()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressEnter</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the ENTER key.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2054,31 +2227,29 @@
 </div>
 
 
-<a id="pressHome()"></a>
+<A NAME="pressHome()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressHome</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the HOME button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2089,80 +2260,41 @@
 </div>
 
 
-<a id="pressKeyCode(int)"></a>
+<A NAME="pressKeyCode(int, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        boolean
-      </span>
-      <span class="sympad">pressKeyCode</span>
-      <span class="normal">(int keyCode)</span>
-    </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
-    <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press using a key code.
-
- See KeyEvent</p></div>
-  <div class="jd-tagdata">
-      <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if successful, else return false</li></ul>
-  </div>
-
-    </div>
-</div>
+        public
 
 
-<a id="pressKeyCode(int, int)"></a>
 
-<div class="jd-details api "> 
-    <h4 class="jd-details-title">
-      <span class="normal">
-        public 
-         
-         
-         
-         
+
         boolean
       </span>
       <span class="sympad">pressKeyCode</span>
       <span class="normal">(int keyCode, int metaState)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press using a key code.
 
- See KeyEvent.</p></div>
+ See <code><a href="../../../../../reference/android/view/KeyEvent.html">KeyEvent</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>keyCode</th>
+          <th>keyCode</td>
           <td>the key code of the event.</td>
         </tr>
         <tr>
-          <th>metaState</th>
+          <th>metaState</td>
           <td>an integer in which each bit set to 1 represents a pressed meta key</td>
         </tr>
       </table>
@@ -2176,31 +2308,64 @@
 </div>
 
 
-<a id="pressMenu()"></a>
+<A NAME="pressKeyCode(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">pressKeyCode</span>
+      <span class="normal">(int keyCode)</span>
+    </h4>
+      <div class="api-level">
+        <div></div>
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press using a key code.
+
+ See <code><a href="../../../../../reference/android/view/KeyEvent.html">KeyEvent</a></code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if successful, else return false</li></ul>
+  </div>
+
+    </div>
+</div>
+
+
+<A NAME="pressMenu()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressMenu</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the MENU button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2211,31 +2376,29 @@
 </div>
 
 
-<a id="pressRecentApps()"></a>
+<A NAME="pressRecentApps()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressRecentApps</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the Recent Apps button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2243,11 +2406,11 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -2259,31 +2422,29 @@
 </div>
 
 
-<a id="pressSearch()"></a>
+<A NAME="pressSearch()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">pressSearch</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates a short press on the SEARCH button.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2294,42 +2455,40 @@
 </div>
 
 
-<a id="registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)"></a>
+<A NAME="registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">registerWatcher</span>
       <span class="normal">(String name, <a href="UiWatcher.html">UiWatcher</a> watcher)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Registers a <code><a href="UiWatcher.html">UiWatcher</a></code> to run automatically when the testing framework is unable to
  find a match using a <code><a href="UiSelector.html">UiSelector</a></code>. See <code><a href="#runWatchers()">runWatchers()</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>name</th>
+          <th>name</td>
           <td>to register the UiWatcher</td>
         </tr>
         <tr>
-          <th>watcher</th>
+          <th>watcher</td>
           <td><code><a href="UiWatcher.html">UiWatcher</a></code></td>
         </tr>
       </table>
@@ -2339,31 +2498,29 @@
 </div>
 
 
-<a id="removeWatcher(java.lang.String)"></a>
+<A NAME="removeWatcher(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">removeWatcher</span>
       <span class="normal">(String name)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Removes a previously registered <code><a href="UiWatcher.html">UiWatcher</a></code>.
 
  See <code><a href="#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">registerWatcher(String, UiWatcher)</a></code></p></div>
@@ -2371,50 +2528,39 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>name</th>
+          <th>name</td>
           <td>used to register the UiWatcher</td>
         </tr>
       </table>
   </div>
-  <div class="jd-tagdata">
-      <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
-        <tr>
-            <th></td>
-            <td>UiAutomationException</td>
-        </tr>
-      </table>
-  </div>
 
     </div>
 </div>
 
 
-<a id="resetWatcherTriggers()"></a>
+<A NAME="resetWatcherTriggers()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">resetWatcherTriggers</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Resets a <code><a href="UiWatcher.html">UiWatcher</a></code> that has been triggered.
  If a UiWatcher runs and its <code><a href="UiWatcher.html#checkForCondition()">checkForCondition()</a></code> call
  returned <code>true</code>, then the UiWatcher is considered triggered.
@@ -2424,31 +2570,29 @@
 </div>
 
 
-<a id="runWatchers()"></a>
+<A NAME="runWatchers()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">runWatchers</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>This method forces all registered watchers to run.
  See <code><a href="#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">registerWatcher(String, UiWatcher)</a></code></p></div>
 
@@ -2456,31 +2600,63 @@
 </div>
 
 
-<a id="setOrientationLeft()"></a>
+<A NAME="setCompressedLayoutHeirarchy(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api apilevel-18">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        void
+      </span>
+      <span class="sympad">setCompressedLayoutHeirarchy</span>
+      <span class="normal">(boolean compressed)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Enables or disables layout hierarchy compression.
+
+ If compression is enabled, the layout hierarchy derived from the Acessibility
+ framework will only contain nodes that are important for uiautomator
+ testing. Any unnecessary surrounding layout nodes that make viewing
+ and searching the hierarchy inefficient are removed.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>compressed</td>
+          <td>true to enable compression; else, false to disable</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setOrientationLeft()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">setOrientationLeft</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates orienting the device to the left and also freezes rotation
  by disabling the sensors.
 
@@ -2488,11 +2664,11 @@
  see <code><a href="#unfreezeRotation()">unfreezeRotation()</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -2500,38 +2676,30 @@
       </table>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="setOrientationNatural()"></a>
+<A NAME="setOrientationNatural()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">setOrientationNatural</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates orienting the device into its natural orientation and also freezes rotation
  by disabling the sensors.
 
@@ -2539,11 +2707,11 @@
  see <code><a href="#unfreezeRotation()">unfreezeRotation()</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -2551,38 +2719,30 @@
       </table>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="setOrientationRight()"></a>
+<A NAME="setOrientationRight()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">setOrientationRight</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Simulates orienting the device to the right and also freezes rotation
  by disabling the sensors.
 
@@ -2590,11 +2750,11 @@
  see <code><a href="#unfreezeRotation()">unfreezeRotation()</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -2602,47 +2762,45 @@
       </table>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="sleep()"></a>
+<A NAME="sleep()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">sleep</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>This method simply presses the power button if the screen is ON else
  it does nothing if the screen is already OFF.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -2654,42 +2812,40 @@
 </div>
 
 
-<a id="swipe(android.graphics.Point[], int)"></a>
+<A NAME="swipe(android.graphics.Point[], int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">swipe</span>
       <span class="normal">(Point[] segments, int segmentSteps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Performs a swipe between points in the Point array. Each step execution is throttled
  to 5ms per step. So for a 100 steps, the swipe will take about 1/2 second to complete</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>segments</th>
+          <th>segments</td>
           <td>is Point array containing at least one Point object</td>
         </tr>
         <tr>
-          <th>segmentSteps</th>
+          <th>segmentSteps</td>
           <td>steps to inject between two Points</td>
         </tr>
       </table>
@@ -2703,31 +2859,29 @@
 </div>
 
 
-<a id="swipe(int, int, int, int, int)"></a>
+<A NAME="swipe(int, int, int, int, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">swipe</span>
       <span class="normal">(int startX, int startY, int endX, int endY, int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Performs a swipe from one coordinate to another using the number of steps
  to determine smoothness and speed. Each step execution is throttled to 5ms
  per step. So for a 100 steps, the swipe will take about 1/2 second to complete.</p></div>
@@ -2735,7 +2889,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>is the number of move steps sent to the system</td>
         </tr>
       </table>
@@ -2749,31 +2903,65 @@
 </div>
 
 
-<a id="takeScreenshot(java.io.File, float, int)"></a>
+<A NAME="takeScreenshot(java.io.File)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">takeScreenshot</span>
+      <span class="normal">(File storePath)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Take a screenshot of current window and store it as PNG
+
+ Default scale of 1.0f (original size) and 90% quality is used
+ The screenshot is adjusted per screen rotation</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>storePath</td>
+          <td>where the PNG should be written to</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if screen shot is created successfully, false otherwise</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="takeScreenshot(java.io.File, float, int)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">takeScreenshot</span>
       <span class="normal">(File storePath, float scale, int quality)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Take a screenshot of current window and store it as PNG
 
  The screenshot is adjusted per screen rotation</p></div>
@@ -2781,15 +2969,15 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>storePath</th>
+          <th>storePath</td>
           <td>where the PNG should be written to</td>
         </tr>
         <tr>
-          <th>scale</th>
+          <th>scale</td>
           <td>scale the screenshot down if needed; 1.0f for original size</td>
         </tr>
         <tr>
-          <th>quality</th>
+          <th>quality</td>
           <td>quality of the PNG compression; range: 0-100</td>
         </tr>
       </table>
@@ -2799,94 +2987,42 @@
       <ul class="nolist"><li>true if screen shot is created successfully, false otherwise</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="takeScreenshot(java.io.File)"></a>
+<A NAME="unfreezeRotation()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        boolean
-      </span>
-      <span class="sympad">takeScreenshot</span>
-      <span class="normal">(File storePath)</span>
-    </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
-    <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Take a screenshot of current window and store it as PNG
-
- Default scale of 1.0f (original size) and 90% quality is used
- The screenshot is adjusted per screen rotation</p></div>
-  <div class="jd-tagdata">
-      <h5 class="jd-tagtitle">Parameters</h5>
-      <table class="jd-tagtable">
-        <tr>
-          <th>storePath</th>
-          <td>where the PNG should be written to</td>
-        </tr>
-      </table>
-  </div>
-  <div class="jd-tagdata">
-      <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if screen shot is created successfully, false otherwise</li></ul>
-  </div>
-  <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
-    </div>
-</div>
+        public
 
 
-<a id="unfreezeRotation()"></a>
 
-<div class="jd-details api "> 
-    <h4 class="jd-details-title">
-      <span class="normal">
-        public 
-         
-         
-         
-         
+
         void
       </span>
       <span class="sympad">unfreezeRotation</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Re-enables the sensors and un-freezes the device rotation allowing its contents
  to rotate with the device physical rotation. During a test execution, it is best to
  keep the device frozen in a specific orientation until the test case execution has completed.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -2898,62 +3034,67 @@
 </div>
 
 
-<a id="waitForIdle(long)"></a>
+<A NAME="waitForIdle(long)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">waitForIdle</span>
-      <span class="normal">(long time)</span>
+      <span class="normal">(long timeout)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Waits for the current application to idle.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>timeout</td>
+          <td>in milliseconds</td>
+        </tr>
+      </table>
+  </div>
 
     </div>
 </div>
 
 
-<a id="waitForIdle()"></a>
+<A NAME="waitForIdle()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">waitForIdle</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Waits for the current application to idle.
  Default wait timeout is 10 seconds</p></div>
 
@@ -2961,31 +3102,29 @@
 </div>
 
 
-<a id="waitForWindowUpdate(java.lang.String, long)"></a>
+<A NAME="waitForWindowUpdate(java.lang.String, long)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">waitForWindowUpdate</span>
       <span class="normal">(String packageName, long timeout)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Waits for a window content update event to occur.
 
  If a package name for the window is specified, but the current window
@@ -2994,12 +3133,12 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>packageName</th>
+          <th>packageName</td>
           <td>the specified window package name (can be <code>null</code>).
         If <code>null</code>, a window update from any front-end window will end the wait</td>
         </tr>
         <tr>
-          <th>timeout</th>
+          <th>timeout</td>
           <td>the timeout for the wait</td>
         </tr>
       </table>
@@ -3014,31 +3153,29 @@
 </div>
 
 
-<a id="wakeUp()"></a>
+<A NAME="wakeUp()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">wakeUp</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>This method simulates pressing the power button if the screen is OFF else
  it does nothing if the screen is already ON.
 
@@ -3046,11 +3183,11 @@
  to allow the device time to wake up and accept input.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th></td>
             <td>RemoteException</td>
-        </tr>  
+        </tr>
         <tr>
             <th>RemoteException</td>
             <td></td>
@@ -3059,7 +3196,6 @@
   </div>
 
     </div>
-</div>
 
 
 
@@ -3069,5 +3205,4 @@
 
 
 
-<!-- ========= END OF CLASS DATA ========= -->
 
diff --git a/docs/html/tools/help/uiautomator/UiObject.jd b/docs/html/tools/help/uiautomator/UiObject.jd
index a22df50..45007e0 100644
--- a/docs/html/tools/help/uiautomator/UiObject.jd
+++ b/docs/html/tools/help/uiautomator/UiObject.jd
@@ -5,31 +5,12 @@
 <style>
     h4.jd-details-title {background-color: #DEE8F1;}
 </style>
-<p>A UiObject is a representation of a user interface (UI) element. It is not in any way directly bound to a
- UI element as an object reference. A UiObject holds information to help it
- locate a matching UI element at runtime based on the <code><a href="UiSelector.html">UiSelector</a></code> properties specified in
- its constructor. Since a UiObject is a representative for a UI element, it can
- be reused for different views with matching UI elements.
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="jd-descr">
-
+<p>A <code><a href="#">UiObject</a></code> is a representation of a view. It is
+not in any way directly bound to a view as an object reference. A <code><a href="#">UiObject</a></code>
+contains information to help it locate a matching view at runtime based on the
+<code><a href="#UiSelector.html">UiSelector</a></code> properties specified in
+its constructor. Once you create an instance of a UiObject, it can be reused for
+different views that match the selector criteria.</p>
 
 <h2>Summary</h2>
 
@@ -45,6 +26,63 @@
 
 
 
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<table id="constants" class="jd-sumtable"><tr><th colspan="12">Constants</th></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol">int</td>
+        <td class="jd-linkcol"><a href="#FINGER_TOUCH_HALF_WIDTH">FINGER_TOUCH_HALF_WIDTH</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">int</td>
+        <td class="jd-linkcol"><a href="#SWIPE_MARGIN_LIMIT">SWIPE_MARGIN_LIMIT</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="#WAIT_FOR_EVENT_TMEOUT">WAIT_FOR_EVENT_TMEOUT</a></td>
+        <td class="jd-descrcol" width="100%"><em>
+      This constant is deprecated.
+    use <code><a href="Configurator.html#setScrollAcknowledgmentTimeout(long)">setScrollAcknowledgmentTimeout(long)</a></code>
+</em></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="#WAIT_FOR_SELECTOR_POLL">WAIT_FOR_SELECTOR_POLL</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="#WAIT_FOR_SELECTOR_TIMEOUT">WAIT_FOR_SELECTOR_TIMEOUT</a></td>
+        <td class="jd-descrcol" width="100%"><em>
+      This constant is deprecated.
+    use <code><a href="Configurator.html#setWaitForSelectorTimeout(long)">setWaitForSelectorTimeout(long)</a></code>
+</em></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="#WAIT_FOR_WINDOW_TMEOUT">WAIT_FOR_WINDOW_TMEOUT</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+
+</table>
+
+
 
 
 
@@ -60,22 +98,22 @@
 
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            </nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#UiObject(com.android.uiautomator.core.UiSelector)">UiObject</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
-        <div class="jd-descrdiv">Constructs a UiObject to represent a specific UI element matched by the specified
- <code><a href="UiSelector.html">UiSelector</a></code> selector properties.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#UiObject(com.android.uiautomator.core.UiSelector)">UiObject</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Constructs a UiObject to represent a view that matches the specified
+ selector criteria.</div>
+
   </td></tr>
 
 
@@ -92,642 +130,766 @@
 
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clearTextField()">clearTextField</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clearTextField()">clearTextField</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clears the existing text contents in an editable field.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#click()">click</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#click()">click</a></span>()</nobr>
+
         <div class="jd-descrdiv">Performs a click at the center of the visible bounds of the UI element represented
  by this UiObject.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow</a></span>(long timeout)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow</a></span>(long timeout)</nobr>
+
         <div class="jd-descrdiv">Performs a click at the center of the visible bounds of the UI element represented
  by this UiObject and waits for window transitions.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clickAndWaitForNewWindow()">clickAndWaitForNewWindow</a></span>()
-        
-        <div class="jd-descrdiv">See <code><a href="#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow(long)</a></code>
- This method is intended to reliably wait for window transitions that would typically take
- longer than the usual default timeouts.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clickAndWaitForNewWindow()">clickAndWaitForNewWindow</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Waits for window transitions that would typically take longer than the
+ usual default timeouts.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clickBottomRight()">clickBottomRight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clickBottomRight()">clickBottomRight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clicks the bottom and right corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clickTopLeft()">clickTopLeft</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clickTopLeft()">clickTopLeft</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clicks the top and left corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#exists()">exists</a></span>()
-        
-        <div class="jd-descrdiv">Check if UI element exists.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#dragTo(com.android.uiautomator.core.UiObject, int)">dragTo</a></span>(<a href="#">UiObject</a> destObj, int steps)</nobr>
+
+        <div class="jd-descrdiv">Drags this object to a destination UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            Rect
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getBounds()">getBounds</a></span>()
-        
-        <div class="jd-descrdiv">Returns the UI element's <code>bounds</code> property.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#dragTo(int, int, int)">dragTo</a></span>(int destX, int destY, int steps)</nobr>
+
+        <div class="jd-descrdiv">Drags this object to arbitrary coordinates.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChild(com.android.uiautomator.core.UiSelector)">getChild</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
-        <div class="jd-descrdiv">Creates a new UiObject representing a child UI element of the element currently represented
- by this UiObject.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#exists()">exists</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if view exists.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Rect</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChildCount()">getChildCount</a></span>()
-        
-        <div class="jd-descrdiv">Counts the child UI elements immediately under the UI element currently represented by
- this UiObject.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getBounds()">getBounds</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the view's <code>bounds</code> property.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getContentDescription()">getContentDescription</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChild(com.android.uiautomator.core.UiSelector)">getChild</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Creates a new UiObject for a child view that is under the present UiObject.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChildCount()">getChildCount</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Counts the child views immediately under the present UiObject.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getClassName()">getClassName</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Retrieves the <code>className</code> property of the UI element.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getContentDescription()">getContentDescription</a></span>()</nobr>
+
         <div class="jd-descrdiv">Reads the <code>content_desc</code> property of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getFromParent(com.android.uiautomator.core.UiSelector)">getFromParent</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
-        <div class="jd-descrdiv">Creates a new UiObject representing a child UI element from the parent element currently
- represented by this object.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getFromParent(com.android.uiautomator.core.UiSelector)">getFromParent</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Creates a new UiObject for a sibling view or a child of the sibling view,
+ relative to the present UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getPackageName()">getPackageName</a></span>()
-        
-        <div class="jd-descrdiv">Reads the UI element's <code>package</code> property</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getPackageName()">getPackageName</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Reads the view's <code>package</code> property</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+
+            <a href="UiSelector.html">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getSelector()">getSelector</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getSelector()">getSelector</a></span>()</nobr>
+
         <div class="jd-descrdiv">Debugging helper.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getText()">getText</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getText()">getText</a></span>()</nobr>
+
         <div class="jd-descrdiv">Reads the <code>text</code> property of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            Rect
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Rect</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getVisibleBounds()">getVisibleBounds</a></span>()
-        
-        <div class="jd-descrdiv">Returns the visible bounds of the UI element.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getVisibleBounds()">getVisibleBounds</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the visible bounds of the view.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isCheckable()">isCheckable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>checkable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isCheckable()">isCheckable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>checkable</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isChecked()">isChecked</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isChecked()">isChecked</a></span>()</nobr>
+
         <div class="jd-descrdiv">Check if the UI element's <code>checked</code> property is currently true</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isClickable()">isClickable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>clickable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isClickable()">isClickable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>clickable</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isEnabled()">isEnabled</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>enabled</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isEnabled()">isEnabled</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>enabled</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isFocusable()">isFocusable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>focusable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isFocusable()">isFocusable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if the UI element's <code>focusable</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isFocused()">isFocused</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isFocused()">isFocused</a></span>()</nobr>
+
         <div class="jd-descrdiv">Check if the UI element's <code>focused</code> property is currently true</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isLongClickable()">isLongClickable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>long-clickable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isLongClickable()">isLongClickable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if the view's <code>long-clickable</code> property is currently true</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isScrollable()">isScrollable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>scrollable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isScrollable()">isScrollable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if the view's <code>scrollable</code> property is currently true</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#isSelected()">isSelected</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>selected</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#isSelected()">isSelected</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>selected</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#longClick()">longClick</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#longClick()">longClick</a></span>()</nobr>
+
         <div class="jd-descrdiv">Long clicks the center of the visible bounds of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#longClickBottomRight()">longClickBottomRight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#longClickBottomRight()">longClickBottomRight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Long clicks bottom and right corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#longClickTopLeft()">longClickTopLeft</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#longClickTopLeft()">longClickTopLeft</a></span>()</nobr>
+
         <div class="jd-descrdiv">Long clicks on the top and left corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setText(java.lang.String)">setText</a></span>(String text)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#performMultiPointerGesture(android.view.MotionEvent.PointerCoords[]...)">performMultiPointerGesture</a></span>(PointerCoords... touches)</nobr>
+
+        <div class="jd-descrdiv">Performs a multi-touch gesture.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#performTwoPointerGesture(android.graphics.Point, android.graphics.Point, android.graphics.Point, android.graphics.Point, int)">performTwoPointerGesture</a></span>(Point startPoint1, Point startPoint2, Point endPoint1, Point endPoint2, int steps)</nobr>
+
+        <div class="jd-descrdiv">Generates a two-pointer gesture with arbitrary starting and ending points.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pinchIn(int, int)">pinchIn</a></span>(int percent, int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a two-pointer gesture, where each pointer moves diagonally
+ toward the other, from the edges to the center of this UiObject .</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#pinchOut(int, int)">pinchOut</a></span>(int percent, int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a two-pointer gesture, where each pointer moves diagonally
+ opposite across the other, from the center out towards the edges of the
+ this UiObject.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setText(java.lang.String)">setText</a></span>(String text)</nobr>
+
         <div class="jd-descrdiv">Sets the text in an editable field, after clearing the field's content.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#swipeDown(int)">swipeDown</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this object, Also see
- #scrollToBeginning(int), #scrollToEnd(int), #scrollBackward(),
- #scrollForward().</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#swipeDown(int)">swipeDown</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe down action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#swipeLeft(int)">swipeLeft</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this object.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#swipeLeft(int)">swipeLeft</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe left action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#swipeRight(int)">swipeRight</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this object.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#swipeRight(int)">swipeRight</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe right action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#swipeUp(int)">swipeUp</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this UiObject.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#swipeUp(int)">swipeUp</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe up action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#waitForExists(long)">waitForExists</a></span>(long timeout)
-        
-        <div class="jd-descrdiv">Waits a specified length of time for a UI element to become visible.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#waitForExists(long)">waitForExists</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Waits a specified length of time for a view to become visible.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#waitUntilGone(long)">waitUntilGone</a></span>(long timeout)
-        
-        <div class="jd-descrdiv">Waits a specified length of time for a UI element to become undetectable.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#waitUntilGone(long)">waitUntilGone</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Waits a specified length of time for a view to become undetectable.</div>
+
   </td></tr>
 
 
@@ -737,6 +899,34 @@
 
 
 
+<!-- ========== METHOD SUMMARY =========== -->
+<table id="promethods" class="jd-sumtable"><tr><th colspan="12">Protected Methods</th></tr>
+
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            AccessibilityNodeInfo</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#findAccessibilityNodeInfo(long)">findAccessibilityNodeInfo</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Finds a matching UI element in the accessibility hierarchy, by
+ using the selector for this UiObject.</div>
+
+  </td></tr>
+
+
+
+</table>
+
+
 
 
 
@@ -746,7 +936,7 @@
   <div style="clear:left;">Inherited Methods</div></th></tr>
 
 
-<tr class="api apilevel-" >
+<tr class="api" >
 <td colspan="12">
   <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-java.lang.Object" class="jd-expando-trigger closed"
           ><img id="inherited-methods-java.lang.Object-trigger"
@@ -762,150 +952,182 @@
   </div>
   <div id="inherited-methods-java.lang.Object-summary" style="display: none;">
     <table class="jd-sumtable-expando">
-    
 
 
-	 
+
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Object</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">equals</span>(Object arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">clone</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">equals</span>(Object arg0)</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">finalize</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            Class&lt;?&gt;
+
+
+            Class&lt;?&gt;</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">getClass</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">getClass</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">hashCode</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">hashCode</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notify</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notify</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notifyAll</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notifyAll</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">toString</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">toString</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0, int arg1)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0, int arg1)</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0)</nobr>
+
   </td></tr>
 
 
@@ -938,6 +1160,251 @@
 <!-- Constants -->
 
 
+<!-- ========= ENUM CONSTANTS DETAIL ======== -->
+<h2>Constants</h2>
+
+
+
+
+<A NAME="FINGER_TOUCH_HALF_WIDTH"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+        static
+        final
+        int
+      </span>
+        FINGER_TOUCH_HALF_WIDTH
+    </h4>
+      <div class="api-level">
+
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p></p></div>
+
+
+        <div class="jd-tagdata">
+        <span class="jd-tagtitle">Constant Value: </span>
+        <span>
+
+                20
+                (0x00000014)
+
+        </span>
+        </div>
+
+    </div>
+</div>
+
+
+
+<A NAME="SWIPE_MARGIN_LIMIT"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+        static
+        final
+        int
+      </span>
+        SWIPE_MARGIN_LIMIT
+    </h4>
+      <div class="api-level">
+
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p></p></div>
+
+
+        <div class="jd-tagdata">
+        <span class="jd-tagtitle">Constant Value: </span>
+        <span>
+
+                5
+                (0x00000005)
+
+        </span>
+        </div>
+
+    </div>
+</div>
+
+
+
+<A NAME="WAIT_FOR_EVENT_TMEOUT"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+        static
+        final
+        long
+      </span>
+        WAIT_FOR_EVENT_TMEOUT
+    </h4>
+      <div class="api-level">
+
+
+
+
+      </div>
+    <div class="jd-details-descr">
+      <p>
+  <p class="caution"><strong>
+      This constant is deprecated.</strong><br/>
+    use <code><a href="Configurator.html#setScrollAcknowledgmentTimeout(long)">setScrollAcknowledgmentTimeout(long)</a></code>
+
+  </p>
+  <div class="jd-tagdata jd-tagdescr"><p></p></div>
+
+
+        <div class="jd-tagdata">
+        <span class="jd-tagtitle">Constant Value: </span>
+        <span>
+
+                3000
+                (0x0000000000000bb8)
+
+        </span>
+        </div>
+
+    </div>
+</div>
+
+
+
+<A NAME="WAIT_FOR_SELECTOR_POLL"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+        static
+        final
+        long
+      </span>
+        WAIT_FOR_SELECTOR_POLL
+    </h4>
+      <div class="api-level">
+
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p></p></div>
+
+
+        <div class="jd-tagdata">
+        <span class="jd-tagtitle">Constant Value: </span>
+        <span>
+
+                1000
+                (0x00000000000003e8)
+
+        </span>
+        </div>
+
+    </div>
+</div>
+
+
+
+<A NAME="WAIT_FOR_SELECTOR_TIMEOUT"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+        static
+        final
+        long
+      </span>
+        WAIT_FOR_SELECTOR_TIMEOUT
+    </h4>
+      <div class="api-level">
+
+
+
+
+      </div>
+    <div class="jd-details-descr">
+      <p>
+  <p class="caution"><strong>
+      This constant is deprecated.</strong><br/>
+    use <code><a href="Configurator.html#setWaitForSelectorTimeout(long)">setWaitForSelectorTimeout(long)</a></code>
+
+  </p>
+  <div class="jd-tagdata jd-tagdescr"><p></p></div>
+
+
+        <div class="jd-tagdata">
+        <span class="jd-tagtitle">Constant Value: </span>
+        <span>
+
+                10000
+                (0x0000000000002710)
+
+        </span>
+        </div>
+
+    </div>
+</div>
+
+
+
+<A NAME="WAIT_FOR_WINDOW_TMEOUT"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+        static
+        final
+        long
+      </span>
+        WAIT_FOR_WINDOW_TMEOUT
+    </h4>
+      <div class="api-level">
+
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p></p></div>
+
+
+        <div class="jd-tagdata">
+        <span class="jd-tagtitle">Constant Value: </span>
+        <span>
+
+                5500
+                (0x000000000000157c)
+
+        </span>
+        </div>
+
+    </div>
+</div>
+
+
+
+
 <!-- Fields -->
 
 
@@ -949,33 +1416,31 @@
 
 
 
-<a id="UiObject(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="UiObject(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        
+        public
+
+
+
+
+
       </span>
       <span class="sympad">UiObject</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Constructs a UiObject to represent a specific UI element matched by the specified
- <code><a href="UiSelector.html">UiSelector</a></code> selector properties.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Constructs a UiObject to represent a view that matches the specified
+ selector criteria.</p></div>
 
     </div>
 </div>
@@ -996,31 +1461,29 @@
 
 
 
-<a id="clearTextField()"></a>
+<A NAME="clearTextField()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         void
       </span>
       <span class="sympad">clearTextField</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Clears the existing text contents in an editable field.
 
  The <code><a href="UiSelector.html">UiSelector</a></code> of this object must reference a UI element that is editable.
@@ -1037,7 +1500,8 @@
  Also, not all editable fields support the long-press functionality.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1049,31 +1513,29 @@
 </div>
 
 
-<a id="click()"></a>
+<A NAME="click()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">click</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Performs a click at the center of the visible bounds of the UI element represented
  by this UiObject.</p></div>
   <div class="jd-tagdata">
@@ -1082,7 +1544,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1094,31 +1557,29 @@
 </div>
 
 
-<a id="clickAndWaitForNewWindow(long)"></a>
+<A NAME="clickAndWaitForNewWindow(long)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">clickAndWaitForNewWindow</span>
       <span class="normal">(long timeout)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Performs a click at the center of the visible bounds of the UI element represented
  by this UiObject and waits for window transitions.
 
@@ -1131,7 +1592,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>timeout</th>
+          <th>timeout</td>
           <td>timeout before giving up on waiting for a new window</td>
         </tr>
       </table>
@@ -1142,7 +1603,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1154,41 +1616,40 @@
 </div>
 
 
-<a id="clickAndWaitForNewWindow()"></a>
+<A NAME="clickAndWaitForNewWindow()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">clickAndWaitForNewWindow</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow(long)</a></code>
- This method is intended to reliably wait for window transitions that would typically take
- longer than the usual default timeouts.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Waits for window transitions that would typically take longer than the
+ usual default timeouts.
+ See <code><a href="#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow(long)</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if the event was triggered, else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1200,31 +1661,29 @@
 </div>
 
 
-<a id="clickBottomRight()"></a>
+<A NAME="clickBottomRight()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">clickBottomRight</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Clicks the bottom and right corner of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1232,11 +1691,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
-        <tr>
-            <th>Exception</td>
-            <td></td>
-        </tr>  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1248,31 +1704,29 @@
 </div>
 
 
-<a id="clickTopLeft()"></a>
+<A NAME="clickTopLeft()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">clickTopLeft</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Clicks the top and left corner of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1280,11 +1734,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
-        <tr>
-            <th>Exception</td>
-            <td></td>
-        </tr>  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1296,134 +1747,243 @@
 </div>
 
 
-<a id="exists()"></a>
+<A NAME="dragTo(com.android.uiautomator.core.UiObject, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">dragTo</span>
+      <span class="normal">(<a href="#">UiObject</a> destObj, int steps)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Drags this object to a destination UiObject.
+ The number of steps specified in your input parameter can influence the
+ drag speed, and varying speeds may impact the results. Consider
+ evaluating different speeds when using this method in your tests.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>destObj</td>
+          <td>the destination UiObject.</td>
+        </tr>
+        <tr>
+          <th>steps</td>
+          <td>usually 40 steps. You can increase or decrease the steps to change the speed.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if successful</li></ul>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Throws</h5>
+      <table class="jd-tagtable">
+
+        <tr>
+            <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
+            <td></td>
+        </tr>
+      </table>
+  </div>
+ <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="dragTo(int, int, int)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">dragTo</span>
+      <span class="normal">(int destX, int destY, int steps)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Drags this object to arbitrary coordinates.
+ The number of steps specified in your input parameter can influence the
+ drag speed, and varying speeds may impact the results. Consider
+ evaluating different speeds when using this method in your tests.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>destX</td>
+          <td>the X-axis coordinate.</td>
+        </tr>
+        <tr>
+          <th>destY</td>
+          <td>the Y-axis coordinate.</td>
+        </tr>
+        <tr>
+          <th>steps</td>
+          <td>usually 40 steps. You can increase or decrease the steps to change the speed.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if successful</li></ul>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Throws</h5>
+      <table class="jd-tagtable">
+
+        <tr>
+            <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
+            <td></td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="exists()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">exists</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if UI element exists.
+
+  <div class="jd-tagdata jd-tagdescr"><p>Check if view exists.
 
  This methods performs a <code><a href="#waitForExists(long)">waitForExists(long)</a></code> with zero timeout. This
- basically returns immediately whether the UI element represented by this UiObject
- exists or not. If you need to wait longer for this UI element, then see
+ basically returns immediately whether the view represented by this UiObject
+ exists or not. If you need to wait longer for this view, then see
  <code><a href="#waitForExists(long)">waitForExists(long)</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if the UI element represented by this UiObject does exist
-</li></ul>
+      <ul class="nolist"><li>true if the view represented by this UiObject does exist</li></ul>
   </div>
 
     </div>
 </div>
 
 
-<a id="getBounds()"></a>
+<A NAME="getBounds()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         Rect
       </span>
       <span class="sympad">getBounds</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Returns the UI element's <code>bounds</code> property. See <code><a href="#getVisibleBounds()">getVisibleBounds()</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Returns the view's <code>bounds</code> property. See <code><a href="#getVisibleBounds()">getVisibleBounds()</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>Rect</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
         </tr>
       </table>
   </div>
+
     </div>
 </div>
 
 
-<a id="getChild(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="getChild(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiObject.html">UiObject</a>
+        public
+
+
+
+
+        <a href="#">UiObject</a>
       </span>
       <span class="sympad">getChild</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Creates a new UiObject representing a child UI element of the element currently represented
- by this UiObject.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Creates a new UiObject for a child view that is under the present UiObject.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>selector</th>
-          <td>for UI element to match</td>
+          <th>selector</td>
+          <td>for child view to match</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>a new UiObject representing the matched UI element
-</li></ul>
+      <ul class="nolist"><li>a new UiObject representing the child view</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1435,40 +1995,38 @@
 </div>
 
 
-<a id="getChildCount()"></a>
+<A NAME="getChildCount()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         int
       </span>
       <span class="sympad">getChildCount</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Counts the child UI elements immediately under the UI element currently represented by
- this UiObject.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Counts the child views immediately under the present UiObject.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>the count of child UI elements.</li></ul>
+      <ul class="nolist"><li>the count of child views.</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1480,31 +2038,68 @@
 </div>
 
 
-<a id="getContentDescription()"></a>
+<A NAME="getClassName()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        String
+      </span>
+      <span class="sympad">getClassName</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Retrieves the <code>className</code> property of the UI element.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>class name of the current node represented by this UiObject</li></ul>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Throws</h5>
+      <table class="jd-tagtable">
+        <tr>
+            <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
+            <td>if no match was found</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="getContentDescription()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getContentDescription</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Reads the <code>content_desc</code> property of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1512,7 +2107,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1524,51 +2120,48 @@
 </div>
 
 
-<a id="getFromParent(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="getFromParent(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiObject.html">UiObject</a>
+        public
+
+
+
+
+        <a href="#">UiObject</a>
       </span>
       <span class="sympad">getFromParent</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Creates a new UiObject representing a child UI element from the parent element currently
- represented by this object. Essentially this is starting the search from the parent
- element and can also be used to find sibling UI elements to the one currently represented
- by this UiObject.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Creates a new UiObject for a sibling view or a child of the sibling view,
+ relative to the present UiObject.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>selector</th>
-          <td>for the UI element to match</td>
+          <th>selector</td>
+          <td>for a sibling view or children of the sibling view</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>a new UiObject representing the matched UI element</li></ul>
+      <ul class="nolist"><li>a new UiObject representing the matched view</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1580,39 +2173,38 @@
 </div>
 
 
-<a id="getPackageName()"></a>
+<A NAME="getPackageName()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getPackageName</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Reads the UI element's <code>package</code> property</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Reads the view's <code>package</code> property</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1624,68 +2216,63 @@
 </div>
 
 
-<a id="getSelector()"></a>
+<A NAME="getSelector()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-        final 
-         
-         
+        public
+
+        final
+
+
         <a href="UiSelector.html">UiSelector</a>
       </span>
       <span class="sympad">getSelector</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Debugging helper. A test can dump the properties of a selector as a string
  to its logs if needed. <code>getSelector().toString();</code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li><code><a href="UiSelector.html">UiSelector</a></code>
-</li></ul>
+      <ul class="nolist"><li><code><a href="UiSelector.html">UiSelector</a></code></li></ul>
   </div>
 
     </div>
 </div>
 
 
-<a id="getText()"></a>
+<A NAME="getText()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">getText</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Reads the <code>text</code> property of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1693,11 +2280,10 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
-            <td>if no match could be found
-</td>
+            <td>if no match could be found</td>
         </tr>
       </table>
   </div>
@@ -1706,34 +2292,26 @@
 </div>
 
 
-<a id="getVisibleBounds()"></a>
+<A NAME="getVisibleBounds()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         Rect
       </span>
       <span class="sympad">getVisibleBounds</span>
       <span class="normal">()</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Returns the visible bounds of the UI element.
 
- If a portion of the UI element is visible, only the bounds of the visible portion are
+  <div class="jd-tagdata jd-tagdescr"><p>Returns the visible bounds of the view.
+
+ If a portion of the view is visible, only the bounds of the visible portion are
  reported.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -1741,58 +2319,59 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
-        <tr>
-            <th></td>
-            <td>UiObjectNotFoundException</td>
-        </tr>  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
         </tr>
       </table>
   </div>
-   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">See Also</h5>
+      <ul class="nolist"><li><code><a href="#getBounds()">getBounds()</a></code></li>
+      </ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="isCheckable()"></a>
+<A NAME="isCheckable()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isCheckable</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>checkable</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Checks if the UI element's <code>checkable</code> property is currently true.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1804,40 +2383,37 @@
 </div>
 
 
-<a id="isChecked()"></a>
+<A NAME="isChecked()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isChecked</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>checked</code> property is currently true</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if it is else false
-</li></ul>
+      <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1849,39 +2425,38 @@
 </div>
 
 
-<a id="isClickable()"></a>
+<A NAME="isClickable()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isClickable</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>clickable</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Checks if the UI element's <code>clickable</code> property is currently true.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1893,39 +2468,38 @@
 </div>
 
 
-<a id="isEnabled()"></a>
+<A NAME="isEnabled()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isEnabled</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>enabled</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Checks if the UI element's <code>enabled</code> property is currently true.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1937,39 +2511,38 @@
 </div>
 
 
-<a id="isFocusable()"></a>
+<A NAME="isFocusable()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isFocusable</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>focusable</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>focusable</code> property is currently true.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1981,31 +2554,29 @@
 </div>
 
 
-<a id="isFocused()"></a>
+<A NAME="isFocused()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isFocused</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>focused</code> property is currently true</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2013,7 +2584,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2025,39 +2597,38 @@
 </div>
 
 
-<a id="isLongClickable()"></a>
+<A NAME="isLongClickable()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isLongClickable</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>long-clickable</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Check if the view's <code>long-clickable</code> property is currently true</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2069,39 +2640,38 @@
 </div>
 
 
-<a id="isScrollable()"></a>
+<A NAME="isScrollable()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isScrollable</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>scrollable</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Check if the view's <code>scrollable</code> property is currently true</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2113,39 +2683,38 @@
 </div>
 
 
-<a id="isSelected()"></a>
+<A NAME="isSelected()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">isSelected</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Check if the UI element's <code>selected</code> property is currently true</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Checks if the UI element's <code>selected</code> property is currently true.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if it is else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2157,31 +2726,29 @@
 </div>
 
 
-<a id="longClick()"></a>
+<A NAME="longClick()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">longClick</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Long clicks the center of the visible bounds of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2189,7 +2756,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2201,31 +2769,29 @@
 </div>
 
 
-<a id="longClickBottomRight()"></a>
+<A NAME="longClickBottomRight()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">longClickBottomRight</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Long clicks bottom and right corner of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2233,7 +2799,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2245,31 +2812,29 @@
 </div>
 
 
-<a id="longClickTopLeft()"></a>
+<A NAME="longClickTopLeft()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">longClickTopLeft</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Long clicks on the top and left corner of the UI element</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
@@ -2277,7 +2842,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2289,31 +2855,254 @@
 </div>
 
 
-<a id="setText(java.lang.String)"></a>
+<A NAME="performMultiPointerGesture(android.view.MotionEvent.PointerCoords[]...)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">performMultiPointerGesture</span>
+      <span class="normal">(PointerCoords... touches)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a multi-touch gesture. You must specify touch coordinates for
+ at least 2 pointers. Each pointer must have all of its touch steps
+ defined in an array of <code><a href="../../../../../reference/android/view/MotionEvent.PointerCoords.html">MotionEvent.PointerCoords</a></code>. You can use this method to
+ specify complex gestures, like circles and irregular shapes, where each
+ pointer may take a different path.
+
+ To create a single point on a pointer's touch path:
+ <code>
+       PointerCoords p = new PointerCoords();
+       p.x = stepX;
+       p.y = stepY;
+       p.pressure = 1;
+       p.size = 1;
+ </code></p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>touches</td>
+          <td>represents the pointers' paths. Each <code><a href="../../../../../reference/android/view/MotionEvent.PointerCoords.html">MotionEvent.PointerCoords</a></code>
+ array represents a different pointer. Each <code><a href="../../../../../reference/android/view/MotionEvent.PointerCoords.html">MotionEvent.PointerCoords</a></code> in an
+ array element represents a touch point on a pointer's path.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li><code>true</code> if all touch events for this gesture are injected successfully,
+         <code>false</code> otherwise</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="performTwoPointerGesture(android.graphics.Point, android.graphics.Point, android.graphics.Point, android.graphics.Point, int)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">performTwoPointerGesture</span>
+      <span class="normal">(Point startPoint1, Point startPoint2, Point endPoint1, Point endPoint2, int steps)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Generates a two-pointer gesture with arbitrary starting and ending points.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>startPoint1</td>
+          <td>start point of pointer 1</td>
+        </tr>
+        <tr>
+          <th>startPoint2</td>
+          <td>start point of pointer 2</td>
+        </tr>
+        <tr>
+          <th>endPoint1</td>
+          <td>end point of pointer 1</td>
+        </tr>
+        <tr>
+          <th>endPoint2</td>
+          <td>end point of pointer 2</td>
+        </tr>
+        <tr>
+          <th>steps</td>
+          <td>the number of steps for the gesture. Steps are injected
+ about 5 milliseconds apart, so 100 steps may take around 0.5 seconds to complete.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li><code>true</code> if all touch events for this gesture are injected successfully,
+         <code>false</code> otherwise</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="pinchIn(int, int)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">pinchIn</span>
+      <span class="normal">(int percent, int steps)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a two-pointer gesture, where each pointer moves diagonally
+ toward the other, from the edges to the center of this UiObject .</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>percent</td>
+          <td>percentage of the object's diagonal length for the pinch gesture</td>
+        </tr>
+        <tr>
+          <th>steps</td>
+          <td>the number of steps for the gesture. Steps are injected
+ about 5 milliseconds apart, so 100 steps may take around 0.5 seconds to complete.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li><code>true</code> if all touch events for this gesture are injected successfully,
+         <code>false</code> otherwise</li></ul>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Throws</h5>
+      <table class="jd-tagtable">
+
+        <tr>
+            <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
+            <td></td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="pinchOut(int, int)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">pinchOut</span>
+      <span class="normal">(int percent, int steps)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a two-pointer gesture, where each pointer moves diagonally
+ opposite across the other, from the center out towards the edges of the
+ this UiObject.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>percent</td>
+          <td>percentage of the object's diagonal length for the pinch gesture</td>
+        </tr>
+        <tr>
+          <th>steps</td>
+          <td>the number of steps for the gesture. Steps are injected
+ about 5 milliseconds apart, so 100 steps may take around 0.5 seconds to complete.</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li><code>true</code> if all touch events for this gesture are injected successfully,
+         <code>false</code> otherwise</li></ul>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Throws</h5>
+      <table class="jd-tagtable">
+
+        <tr>
+            <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
+            <td></td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="setText(java.lang.String)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">setText</span>
       <span class="normal">(String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Sets the text in an editable field, after clearing the field's content.
 
  The <code><a href="UiSelector.html">UiSelector</a></code> selector of this object must reference a UI element that is editable.
@@ -2328,7 +3117,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>text</th>
+          <th>text</td>
           <td>string to set</td>
         </tr>
       </table>
@@ -2339,7 +3128,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2351,41 +3141,44 @@
 </div>
 
 
-<a id="swipeDown(int)"></a>
+<A NAME="swipeDown(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">swipeDown</span>
       <span class="normal">(int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform the action on the UI element that is represented by this object, Also see
- #scrollToBeginning(int), #scrollToEnd(int), #scrollBackward(),
- #scrollForward(). This method will perform the swipe gesture over any
- surface. The targeted UI element does not need to have the attribute
- <code>scrollable</code> set to <code>true</code> for this operation to be performed.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs the swipe down action on the UiObject.
+ The swipe gesture can be performed over any surface. The targeted
+ UI element does not need to be scrollable.
+ See also:
+ <ul>
+ <li><code><a href="UiScrollable.html#scrollToBeginning(int)">scrollToBeginning(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollToEnd(int)">scrollToEnd(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollBackward()">scrollBackward()</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollForward()">scrollForward()</a></code></li>
+ </ul></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>indicates the number of injected move steps into the system. Steps are
  injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.</td>
         </tr>
@@ -2397,7 +3190,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2409,41 +3203,44 @@
 </div>
 
 
-<a id="swipeLeft(int)"></a>
+<A NAME="swipeLeft(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">swipeLeft</span>
       <span class="normal">(int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform the action on the UI element that is represented by this object. Also see
- #scrollToBeginning(int), #scrollToEnd(int), #scrollBackward(),
- #scrollForward(). This method will perform the swipe gesture over any
- surface. The targeted UI element does not need to have the attribute
- <code>scrollable</code> set to <code>true</code> for this operation to be performed.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs the swipe left action on the UiObject.
+ The swipe gesture can be performed over any surface. The targeted
+ UI element does not need to be scrollable.
+ See also:
+ <ul>
+ <li><code><a href="UiScrollable.html#scrollToBeginning(int)">scrollToBeginning(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollToEnd(int)">scrollToEnd(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollBackward()">scrollBackward()</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollForward()">scrollForward()</a></code></li>
+ </ul></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>indicates the number of injected move steps into the system. Steps are
  injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.</td>
         </tr>
@@ -2455,7 +3252,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2467,41 +3265,44 @@
 </div>
 
 
-<a id="swipeRight(int)"></a>
+<A NAME="swipeRight(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">swipeRight</span>
       <span class="normal">(int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform the action on the UI element that is represented by this object. Also see
- #scrollToBeginning(int), #scrollToEnd(int), #scrollBackward(),
- #scrollForward(). This method will perform the swipe gesture over any
- surface. The targeted UI element does not need to have the attribute
- <code>scrollable</code> set to <code>true</code> for this operation to be performed.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs the swipe right action on the UiObject.
+ The swipe gesture can be performed over any surface. The targeted
+ UI element does not need to be scrollable.
+ See also:
+ <ul>
+ <li><code><a href="UiScrollable.html#scrollToBeginning(int)">scrollToBeginning(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollToEnd(int)">scrollToEnd(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollBackward()">scrollBackward()</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollForward()">scrollForward()</a></code></li>
+ </ul></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>indicates the number of injected move steps into the system. Steps are
  injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.</td>
         </tr>
@@ -2513,7 +3314,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2525,39 +3327,42 @@
 </div>
 
 
-<a id="swipeUp(int)"></a>
+<A NAME="swipeUp(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">swipeUp</span>
       <span class="normal">(int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform the action on the UI element that is represented by this UiObject. Also see
- #scrollToBeginning(int), #scrollToEnd(int), #scrollBackward(),
- #scrollForward().</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs the swipe up action on the UiObject.
+ See also:
+ <ul>
+ <li><code><a href="UiScrollable.html#scrollToBeginning(int)">scrollToBeginning(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollToEnd(int)">scrollToEnd(int)</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollBackward()">scrollBackward()</a></code></li>
+ <li><code><a href="UiScrollable.html#scrollForward()">scrollForward()</a></code></li>
+ </ul></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>indicates the number of injected move steps into the system. Steps are
  injected about 5ms apart. So a 100 steps may take about 1/2 second to complete.</td>
         </tr>
@@ -2569,7 +3374,8 @@
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2581,86 +3387,81 @@
 </div>
 
 
-<a id="waitForExists(long)"></a>
+<A NAME="waitForExists(long)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">waitForExists</span>
       <span class="normal">(long timeout)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Waits a specified length of time for a UI element to become visible.
 
- This method waits until the UI element becomes visible on the display, or
+  <div class="jd-tagdata jd-tagdescr"><p>Waits a specified length of time for a view to become visible.
+
+ This method waits until the view becomes visible on the display, or
  until the timeout has elapsed. You can use this method in situations where
  the content that you want to select is not immediately displayed.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>timeout</th>
+          <th>timeout</td>
           <td>the amount of time to wait (in milliseconds)</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if the UI element is displayed, else false if timeout elapsed while waiting
-</li></ul>
+      <ul class="nolist"><li>true if the view is displayed, else false if timeout elapsed while waiting</li></ul>
   </div>
 
     </div>
 </div>
 
 
-<a id="waitUntilGone(long)"></a>
+<A NAME="waitUntilGone(long)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">waitUntilGone</span>
       <span class="normal">(long timeout)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Waits a specified length of time for a UI element to become undetectable.
 
- This method waits until a UI element is no longer matchable, or until the
+  <div class="jd-tagdata jd-tagdescr"><p>Waits a specified length of time for a view to become undetectable.
+
+ This method waits until a view is no longer matchable, or until the
  timeout has elapsed.
 
- A UI element becomes undetectable when the <code><a href="UiSelector.html">UiSelector</a></code> of the object is
+ A view becomes undetectable when the <code><a href="UiSelector.html">UiSelector</a></code> of the object is
  unable to find a match because the element has either changed its state or is no
  longer displayed.
 
@@ -2670,7 +3471,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>timeout</th>
+          <th>timeout</td>
           <td>time to wait (in milliseconds)</td>
         </tr>
       </table>
@@ -2678,10 +3479,65 @@
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>true if the element is gone before timeout elapsed, else false if timeout elapsed
- but a matching element is still found.
-</li></ul>
+ but a matching element is still found.</li></ul>
   </div>
 
     </div>
 </div>
 
+
+
+
+
+<!-- ========= METHOD DETAIL ======== -->
+
+<h2>Protected Methods</h2>
+
+
+
+<A NAME="findAccessibilityNodeInfo(long)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+
+
+
+
+        AccessibilityNodeInfo
+      </span>
+      <span class="sympad">findAccessibilityNodeInfo</span>
+      <span class="normal">(long timeout)</span>
+    </h4>
+      <div class="api-level">
+        <div></div>
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Finds a matching UI element in the accessibility hierarchy, by
+ using the selector for this UiObject.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>timeout</td>
+          <td>in milliseconds</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>AccessibilityNodeInfo if found else null</li></ul>
+  </div>
+
+    </div>
+
+
+
+
+
+
diff --git a/docs/html/tools/help/uiautomator/UiObjectNotFoundException.jd b/docs/html/tools/help/uiautomator/UiObjectNotFoundException.jd
index 02c607d..b41cfe5 100644
--- a/docs/html/tools/help/uiautomator/UiObjectNotFoundException.jd
+++ b/docs/html/tools/help/uiautomator/UiObjectNotFoundException.jd
@@ -9,29 +9,6 @@
  to any UI element displayed.
 </p>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="jd-descr">
-
-
 <h2>Summary</h2>
 
 
@@ -627,4 +604,3 @@
   <div class="jd-tagdata jd-tagdescr"><p></p></div>
 
     </div>
-</div>
diff --git a/docs/html/tools/help/uiautomator/UiScrollable.jd b/docs/html/tools/help/uiautomator/UiScrollable.jd
index 33566a2..7405f3b 100644
--- a/docs/html/tools/help/uiautomator/UiScrollable.jd
+++ b/docs/html/tools/help/uiautomator/UiScrollable.jd
@@ -5,33 +5,9 @@
 <style>
     h4.jd-details-title {background-color: #DEE8F1;}
 </style>
-<p>UiScrollable is a <code><a href="UiCollection.html">UiCollection</a></code> and provides support for searching for items in a
- scrollable user interface (UI) elements. This class can be used with horizontally or vertically scrollable controls..
-</p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="jd-descr">
-
-
+<p>A <code><a href="UiCollection.html">UiCollection</a></code>
+that supports searching for items in scrollable layout elements. This class can
+be used with horizontally or vertically scrollable controls.</p>
 <h2>Summary</h2>
 
 
@@ -49,6 +25,90 @@
 
 
 
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<table id="inhconstants" class="jd-sumtable"><tr><th>
+  <a href="#" class="toggle-all" onclick="return toggleAllInherited(this, null)">[Expand]</a>
+  <div style="clear:left;">Inherited Constants</div></th></tr>
+
+
+
+
+<tr class="api" >
+<td colspan="12">
+
+  <a href="#" onclick="return toggleInherited(this, null)" id="inherited-constants-com.android.uiautomator.core.UiObject" class="jd-expando-trigger closed"
+          ><img id="inherited-constants-com.android.uiautomator.core.UiObject-trigger"
+          src="../../../../../assets/images/triangle-closed.png"
+          class="jd-expando-trigger-img" /></a>From class
+<a href="UiObject.html">com.android.uiautomator.core.UiObject</a>
+<div id="inherited-constants-com.android.uiautomator.core.UiObject">
+  <div id="inherited-constants-com.android.uiautomator.core.UiObject-list"
+        class="jd-inheritedlinks">
+  </div>
+  <div id="inherited-constants-com.android.uiautomator.core.UiObject-summary" style="display: none;">
+    <table class="jd-sumtable-expando">
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol">int</td>
+        <td class="jd-linkcol"><a href="UiObject.html#FINGER_TOUCH_HALF_WIDTH">FINGER_TOUCH_HALF_WIDTH</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">int</td>
+        <td class="jd-linkcol"><a href="UiObject.html#SWIPE_MARGIN_LIMIT">SWIPE_MARGIN_LIMIT</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="UiObject.html#WAIT_FOR_EVENT_TMEOUT">WAIT_FOR_EVENT_TMEOUT</a></td>
+        <td class="jd-descrcol" width="100%"><em>
+      This constant is deprecated.
+    use <code><a href="Configurator.html#setScrollAcknowledgmentTimeout(long)">setScrollAcknowledgmentTimeout(long)</a></code>
+</em></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="UiObject.html#WAIT_FOR_SELECTOR_POLL">WAIT_FOR_SELECTOR_POLL</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="UiObject.html#WAIT_FOR_SELECTOR_TIMEOUT">WAIT_FOR_SELECTOR_TIMEOUT</a></td>
+        <td class="jd-descrcol" width="100%"><em>
+      This constant is deprecated.
+    use <code><a href="Configurator.html#setWaitForSelectorTimeout(long)">setWaitForSelectorTimeout(long)</a></code>
+</em></td>
+    </tr>
+
+
+    <tr class="api" >
+        <td class="jd-typecol">long</td>
+        <td class="jd-linkcol"><a href="UiObject.html#WAIT_FOR_WINDOW_TMEOUT">WAIT_FOR_WINDOW_TMEOUT</a></td>
+        <td class="jd-descrcol" width="100%"></td>
+    </tr>
+
+
+</table>
+  </div>
+</div>
+</td></tr>
+
+
+
+
+</table>
+
+
 
 
 
@@ -61,22 +121,21 @@
 
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            </nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#UiScrollable(com.android.uiautomator.core.UiSelector)">UiScrollable</a></span>(<a href="UiSelector.html">UiSelector</a> container)
-        
-        <div class="jd-descrdiv">UiScrollable is a <code><a href="UiCollection.html">UiCollection</a></code> and as such requires a <code><a href="UiSelector.html">UiSelector</a></code> to
- identify the container UI element of the scrollable collection.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#UiScrollable(com.android.uiautomator.core.UiSelector)">UiScrollable</a></span>(<a href="UiSelector.html">UiSelector</a> container)</nobr>
+
+        <div class="jd-descrdiv">Constructor.</div>
+
   </td></tr>
 
 
@@ -93,480 +152,500 @@
 
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#flingBackward()">flingBackward</a></span>()
-        
-        <div class="jd-descrdiv">See <code><a href="#scrollBackward(int)">scrollBackward(int)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#flingBackward()">flingBackward</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Performs a backwards fling action with the default number of fling
+ steps (5).</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#flingForward()">flingForward</a></span>()
-        
-        <div class="jd-descrdiv">A convenience version of <code><a href="#scrollForward(int)">scrollForward(int)</a></code>, performs a fling</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#flingForward()">flingForward</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Performs a forward fling with the default number of fling steps (5).</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#flingToBeginning(int)">flingToBeginning</a></span>(int maxSwipes)
-        
-        <div class="jd-descrdiv">See <code><a href="#scrollToBeginning(int, int)">scrollToBeginning(int, int)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#flingToBeginning(int)">flingToBeginning</a></span>(int maxSwipes)</nobr>
+
+        <div class="jd-descrdiv">Performs a fling gesture to reach the beginning of a scrollable layout element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#flingToEnd(int)">flingToEnd</a></span>(int maxSwipes)
-        
-        <div class="jd-descrdiv">See <code><a href="#scrollToEnd(int, int)">scrollToEnd(int, int)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#flingToEnd(int)">flingToEnd</a></span>(int maxSwipes)</nobr>
+
+        <div class="jd-descrdiv">Performs a fling gesture to reach the end of a scrollable layout element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)">getChildByDescription</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text, boolean allowScrollSearch)
-        
-        <div class="jd-descrdiv">See <code><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription(UiSelector, String)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)">getChildByDescription</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text, boolean allowScrollSearch)</nobr>
+
+        <div class="jd-descrdiv">Searches for a child element in the present scrollable container.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)
-        
-        <div class="jd-descrdiv">Searches for child UI element within the constraints of this UiScrollable <code><a href="UiSelector.html">UiSelector</a></code>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)</nobr>
+
+        <div class="jd-descrdiv">Searches for a child element in the present scrollable container.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChildByInstance(com.android.uiautomator.core.UiSelector, int)">getChildByInstance</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, int instance)</nobr>
+
+        <div class="jd-descrdiv">Searches for a child element in the present scrollable container that
+ matches the selector you provided.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)">getChildByText</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text, boolean allowScrollSearch)</nobr>
+
+        <div class="jd-descrdiv">Searches for a child element in the present scrollable container.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)</nobr>
+
+        <div class="jd-descrdiv">Searches for a child element in the present scrollable
  container.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChildByInstance(com.android.uiautomator.core.UiSelector, int)">getChildByInstance</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, int instance)
-        
-        <div class="jd-descrdiv">Searches for child UI element within the constraints of this UiScrollable <code><a href="UiSelector.html">UiSelector</a></code>
- selector.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getMaxSearchSwipes()">getMaxSearchSwipes</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Gets the maximum number of scrolls allowed when performing a
+ scroll action in search of a child element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            double</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)">getChildByText</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text, boolean allowScrollSearch)
-        
-        <div class="jd-descrdiv">See <code><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText(UiSelector, String)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#getSwipeDeadZonePercentage()">getSwipeDeadZonePercentage</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the percentage of a widget's size that's considered as a no-touch
+ zone when swiping.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)
-        
-        <div class="jd-descrdiv">Searches for child UI element within the constraints of this UiScrollable <code><a href="UiSelector.html">UiSelector</a></code>
- container.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollBackward(int)">scrollBackward</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a backward scroll.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getMaxSearchSwipes()">getMaxSearchSwipes</a></span>()
-        
-        <div class="jd-descrdiv">#getChildByDescription(String, boolean) and #getChildByText(String, boolean)
- use an arguments that specifies if scrolling is allowed while searching for the UI element.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollBackward()">scrollBackward</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Performs a backward scroll with the default number of scroll steps (55).</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            double
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#getSwipeDeadZonePercentage()">getSwipeDeadZonePercentage</a></span>()
-        
-        <div class="jd-descrdiv">Returns the percentage of a widget's size that's considered as a no touch zone when swiping.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollDescriptionIntoView(java.lang.String)">scrollDescriptionIntoView</a></span>(String text)</nobr>
+
+        <div class="jd-descrdiv">Performs a forward scroll action on the scrollable layout element until
+ the content-description is found, or until swipe attempts have been exhausted.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollBackward(int)">scrollBackward</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform a scroll backward.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollForward()">scrollForward</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Performs a forward scroll with the default number of scroll steps (55).</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollBackward()">scrollBackward</a></span>()
-        
-        <div class="jd-descrdiv">See <code><a href="#scrollBackward(int)">scrollBackward(int)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollForward(int)">scrollForward</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a forward scroll.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollDescriptionIntoView(java.lang.String)">scrollDescriptionIntoView</a></span>(String text)
-        
-        <div class="jd-descrdiv">Performs a swipe Up on the UI element until the requested content-description
- is visible or until swipe attempts have been exhausted.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollIntoView(com.android.uiautomator.core.UiSelector)">scrollIntoView</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Perform a scroll forward action to move through the scrollable layout
+ element until a visible item that matches the selector is found.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollForward()">scrollForward</a></span>()
-        
-        <div class="jd-descrdiv">A convenience version of <code><a href="#scrollForward(int)">scrollForward(int)</a></code>, performs a regular scroll</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollIntoView(com.android.uiautomator.core.UiObject)">scrollIntoView</a></span>(<a href="UiObject.html">UiObject</a> obj)</nobr>
+
+        <div class="jd-descrdiv">Perform a forward scroll action to move through the scrollable layout element until
+ a visible item that matches the <code><a href="UiObject.html">UiObject</a></code> is found.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollForward(int)">scrollForward</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform a scroll forward.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollTextIntoView(java.lang.String)">scrollTextIntoView</a></span>(String text)</nobr>
+
+        <div class="jd-descrdiv">Performs a forward scroll action on the scrollable layout element until
+ the text you provided is visible, or until swipe attempts have been exhausted.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollIntoView(com.android.uiautomator.core.UiSelector)">scrollIntoView</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
-        <div class="jd-descrdiv">Perform a scroll search for a UI element matching the <code><a href="UiSelector.html">UiSelector</a></code> selector argument.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollToBeginning(int)">scrollToBeginning</a></span>(int maxSwipes)</nobr>
+
+        <div class="jd-descrdiv">Scrolls to the beginning of a scrollable layout element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollTextIntoView(java.lang.String)">scrollTextIntoView</a></span>(String text)
-        
-        <div class="jd-descrdiv">Performs a swipe up on the UI element until the requested text is visible
- or until swipe attempts have been exhausted.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollToBeginning(int, int)">scrollToBeginning</a></span>(int maxSwipes, int steps)</nobr>
+
+        <div class="jd-descrdiv">Scrolls to the beginning of a scrollable layout element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollToBeginning(int)">scrollToBeginning</a></span>(int maxSwipes)
-        
-        <div class="jd-descrdiv">See <code><a href="#scrollToBeginning(int, int)">scrollToBeginning(int, int)</a></code></div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollToEnd(int, int)">scrollToEnd</a></span>(int maxSwipes, int steps)</nobr>
+
+        <div class="jd-descrdiv">Scrolls to the end of a scrollable layout element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollToBeginning(int, int)">scrollToBeginning</a></span>(int maxSwipes, int steps)
-        
-        <div class="jd-descrdiv">Scrolls to the beginning of a scrollable UI element.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollToEnd(int)">scrollToEnd</a></span>(int maxSwipes)</nobr>
+
+        <div class="jd-descrdiv">Scrolls to the end of a scrollable layout element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiScrollable</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollToEnd(int, int)">scrollToEnd</a></span>(int maxSwipes, int steps)
-        
-        <div class="jd-descrdiv">Scrolls to the end of a scrollable UI element.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setAsHorizontalList()">setAsHorizontalList</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Set the direction of swipes to be horizontal when performing scroll actions.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiScrollable</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollToEnd(int)">scrollToEnd</a></span>(int maxSwipes)
-        
-        <div class="jd-descrdiv">See {@link UiScrollable#scrollToEnd(int, int)</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setAsVerticalList()">setAsVerticalList</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Set the direction of swipes to be vertical when performing scroll actions.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiScrollable</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setAsHorizontalList()">setAsHorizontalList</a></span>()
-        
-        <div class="jd-descrdiv">Set the direction of swipes when performing scroll search
-</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes</a></span>(int swipes)</nobr>
+
+        <div class="jd-descrdiv">Sets the maximum number of scrolls allowed when performing a
+ scroll action in search of a child element.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiScrollable</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setAsVerticalList()">setAsVerticalList</a></span>()
-        
-        <div class="jd-descrdiv">Set the direction of swipes when performing scroll search
-</div>
-  
-  </td></tr>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#setSwipeDeadZonePercentage(double)">setSwipeDeadZonePercentage</a></span>(double swipeDeadZonePercentage)</nobr>
 
+        <div class="jd-descrdiv">Sets the percentage of a widget's size that's considered as no-touch
+ zone when swiping.</div>
 
-	 
-    <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
-        </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes</a></span>(int swipes)
-        
-        <div class="jd-descrdiv">#getChildByDescription(String, boolean) and #getChildByText(String, boolean)
- use an arguments that specifies if scrolling is allowed while searching for the UI element.</div>
-  
-  </td></tr>
-
-
-	 
-    <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
-        </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#setSwipeDeadZonePercentage(double)">setSwipeDeadZonePercentage</a></span>(double swipeDeadZonePercentage)
-        
-        <div class="jd-descrdiv">Sets the percentage of a widget's size that's considered as a no touch zone when swiping.</div>
-  
   </td></tr>
 
 
@@ -576,6 +655,34 @@
 
 
 
+<!-- ========== METHOD SUMMARY =========== -->
+<table id="promethods" class="jd-sumtable"><tr><th colspan="12">Protected Methods</th></tr>
+
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#exists(com.android.uiautomator.core.UiSelector)">exists</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Used privately when performing swipe searches to decide if an element has become
+ visible or not.</div>
+
+  </td></tr>
+
+
+
+</table>
+
+
 
 
 
@@ -585,7 +692,7 @@
   <div style="clear:left;">Inherited Methods</div></th></tr>
 
 
-<tr class="api apilevel-" >
+<tr class="api" >
 <td colspan="12">
   <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-com.android.uiautomator.core.UiCollection" class="jd-expando-trigger closed"
           ><img id="inherited-methods-com.android.uiautomator.core.UiCollection-trigger"
@@ -601,82 +708,82 @@
   </div>
   <div id="inherited-methods-com.android.uiautomator.core.UiCollection-summary" style="display: none;">
     <table class="jd-sumtable-expando">
-    
 
 
-	 
+
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiCollection.html#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiCollection.html#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)</nobr>
+
         <div class="jd-descrdiv">Searches for child UI element within the constraints of this UiCollection <code><a href="UiSelector.html">UiSelector</a></code>
  selector.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiCollection.html#getChildByInstance(com.android.uiautomator.core.UiSelector, int)">getChildByInstance</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, int instance)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiCollection.html#getChildByInstance(com.android.uiautomator.core.UiSelector, int)">getChildByInstance</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, int instance)</nobr>
+
         <div class="jd-descrdiv">Searches for child UI element within the constraints of this UiCollection <code><a href="UiSelector.html">UiSelector</a></code>
  selector.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiCollection.html#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiCollection.html#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern, String text)</nobr>
+
         <div class="jd-descrdiv">Searches for child UI element within the constraints of this UiCollection <code><a href="UiSelector.html">UiSelector</a></code>
  selector.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiCollection.html#getChildCount(com.android.uiautomator.core.UiSelector)">getChildCount</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiCollection.html#getChildCount(com.android.uiautomator.core.UiSelector)">getChildCount</a></span>(<a href="UiSelector.html">UiSelector</a> childPattern)</nobr>
+
         <div class="jd-descrdiv">Counts child UI element instances matching the <code>childPattern</code>
  argument.</div>
-  
+
   </td></tr>
 
 
@@ -687,7 +794,7 @@
 
 
 
-<tr class="api apilevel-" >
+<tr class="api" >
 <td colspan="12">
   <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-com.android.uiautomator.core.UiObject" class="jd-expando-trigger closed"
           ><img id="inherited-methods-com.android.uiautomator.core.UiObject-trigger"
@@ -703,645 +810,788 @@
   </div>
   <div id="inherited-methods-com.android.uiautomator.core.UiObject-summary" style="display: none;">
     <table class="jd-sumtable-expando">
-    
 
 
-	 
+
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            void
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#clearTextField()">clearTextField</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#clearTextField()">clearTextField</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clears the existing text contents in an editable field.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#click()">click</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#click()">click</a></span>()</nobr>
+
         <div class="jd-descrdiv">Performs a click at the center of the visible bounds of the UI element represented
  by this UiObject.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow</a></span>(long timeout)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow</a></span>(long timeout)</nobr>
+
         <div class="jd-descrdiv">Performs a click at the center of the visible bounds of the UI element represented
  by this UiObject and waits for window transitions.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#clickAndWaitForNewWindow()">clickAndWaitForNewWindow</a></span>()
-        
-        <div class="jd-descrdiv">See <code><a href="UiObject.html#clickAndWaitForNewWindow(long)">clickAndWaitForNewWindow(long)</a></code>
- This method is intended to reliably wait for window transitions that would typically take
- longer than the usual default timeouts.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#clickAndWaitForNewWindow()">clickAndWaitForNewWindow</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Waits for window transitions that would typically take longer than the
+ usual default timeouts.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#clickBottomRight()">clickBottomRight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#clickBottomRight()">clickBottomRight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clicks the bottom and right corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#clickTopLeft()">clickTopLeft</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#clickTopLeft()">clickTopLeft</a></span>()</nobr>
+
         <div class="jd-descrdiv">Clicks the top and left corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#exists()">exists</a></span>()
-        
-        <div class="jd-descrdiv">Check if UI element exists.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#dragTo(com.android.uiautomator.core.UiObject, int)">dragTo</a></span>(<a href="UiObject.html">UiObject</a> destObj, int steps)</nobr>
+
+        <div class="jd-descrdiv">Drags this object to a destination UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            Rect
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getBounds()">getBounds</a></span>()
-        
-        <div class="jd-descrdiv">Returns the UI element's <code>bounds</code> property.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#dragTo(int, int, int)">dragTo</a></span>(int destX, int destY, int steps)</nobr>
+
+        <div class="jd-descrdiv">Drags this object to arbitrary coordinates.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getChild(com.android.uiautomator.core.UiSelector)">getChild</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
-        <div class="jd-descrdiv">Creates a new UiObject representing a child UI element of the element currently represented
- by this UiObject.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#exists()">exists</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if view exists.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            AccessibilityNodeInfo</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getChildCount()">getChildCount</a></span>()
-        
-        <div class="jd-descrdiv">Counts the child UI elements immediately under the UI element currently represented by
- this UiObject.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#findAccessibilityNodeInfo(long)">findAccessibilityNodeInfo</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Finds a matching UI element in the accessibility hierarchy, by
+ using the selector for this UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Rect</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getContentDescription()">getContentDescription</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getBounds()">getBounds</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the view's <code>bounds</code> property.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getChild(com.android.uiautomator.core.UiSelector)">getChild</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Creates a new UiObject for a child view that is under the present UiObject.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getChildCount()">getChildCount</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Counts the child views immediately under the present UiObject.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getClassName()">getClassName</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Retrieves the <code>className</code> property of the UI element.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getContentDescription()">getContentDescription</a></span>()</nobr>
+
         <div class="jd-descrdiv">Reads the <code>content_desc</code> property of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiObject.html">UiObject</a>
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="UiObject.html">UiObject</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getFromParent(com.android.uiautomator.core.UiSelector)">getFromParent</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
-        <div class="jd-descrdiv">Creates a new UiObject representing a child UI element from the parent element currently
- represented by this object.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getFromParent(com.android.uiautomator.core.UiSelector)">getFromParent</a></span>(<a href="UiSelector.html">UiSelector</a> selector)</nobr>
+
+        <div class="jd-descrdiv">Creates a new UiObject for a sibling view or a child of the sibling view,
+ relative to the present UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getPackageName()">getPackageName</a></span>()
-        
-        <div class="jd-descrdiv">Reads the UI element's <code>package</code> property</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getPackageName()">getPackageName</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Reads the view's <code>package</code> property</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+
+            <a href="UiSelector.html">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getSelector()">getSelector</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getSelector()">getSelector</a></span>()</nobr>
+
         <div class="jd-descrdiv">Debugging helper.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getText()">getText</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getText()">getText</a></span>()</nobr>
+
         <div class="jd-descrdiv">Reads the <code>text</code> property of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            Rect
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Rect</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#getVisibleBounds()">getVisibleBounds</a></span>()
-        
-        <div class="jd-descrdiv">Returns the visible bounds of the UI element.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#getVisibleBounds()">getVisibleBounds</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Returns the visible bounds of the view.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isCheckable()">isCheckable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>checkable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isCheckable()">isCheckable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>checkable</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isChecked()">isChecked</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isChecked()">isChecked</a></span>()</nobr>
+
         <div class="jd-descrdiv">Check if the UI element's <code>checked</code> property is currently true</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isClickable()">isClickable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>clickable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isClickable()">isClickable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>clickable</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isEnabled()">isEnabled</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>enabled</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isEnabled()">isEnabled</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>enabled</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isFocusable()">isFocusable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>focusable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isFocusable()">isFocusable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if the UI element's <code>focusable</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isFocused()">isFocused</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isFocused()">isFocused</a></span>()</nobr>
+
         <div class="jd-descrdiv">Check if the UI element's <code>focused</code> property is currently true</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isLongClickable()">isLongClickable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>long-clickable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isLongClickable()">isLongClickable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if the view's <code>long-clickable</code> property is currently true</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isScrollable()">isScrollable</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>scrollable</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isScrollable()">isScrollable</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Check if the view's <code>scrollable</code> property is currently true</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#isSelected()">isSelected</a></span>()
-        
-        <div class="jd-descrdiv">Check if the UI element's <code>selected</code> property is currently true</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#isSelected()">isSelected</a></span>()</nobr>
+
+        <div class="jd-descrdiv">Checks if the UI element's <code>selected</code> property is currently true.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#longClick()">longClick</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#longClick()">longClick</a></span>()</nobr>
+
         <div class="jd-descrdiv">Long clicks the center of the visible bounds of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#longClickBottomRight()">longClickBottomRight</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#longClickBottomRight()">longClickBottomRight</a></span>()</nobr>
+
         <div class="jd-descrdiv">Long clicks bottom and right corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#longClickTopLeft()">longClickTopLeft</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#longClickTopLeft()">longClickTopLeft</a></span>()</nobr>
+
         <div class="jd-descrdiv">Long clicks on the top and left corner of the UI element</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#setText(java.lang.String)">setText</a></span>(String text)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#performMultiPointerGesture(android.view.MotionEvent.PointerCoords[]...)">performMultiPointerGesture</a></span>(PointerCoords... touches)</nobr>
+
+        <div class="jd-descrdiv">Performs a multi-touch gesture.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#performTwoPointerGesture(android.graphics.Point, android.graphics.Point, android.graphics.Point, android.graphics.Point, int)">performTwoPointerGesture</a></span>(Point startPoint1, Point startPoint2, Point endPoint1, Point endPoint2, int steps)</nobr>
+
+        <div class="jd-descrdiv">Generates a two-pointer gesture with arbitrary starting and ending points.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#pinchIn(int, int)">pinchIn</a></span>(int percent, int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a two-pointer gesture, where each pointer moves diagonally
+ toward the other, from the edges to the center of this UiObject .</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#pinchOut(int, int)">pinchOut</a></span>(int percent, int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs a two-pointer gesture, where each pointer moves diagonally
+ opposite across the other, from the center out towards the edges of the
+ this UiObject.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#setText(java.lang.String)">setText</a></span>(String text)</nobr>
+
         <div class="jd-descrdiv">Sets the text in an editable field, after clearing the field's content.</div>
-  
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#swipeDown(int)">swipeDown</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this object, Also see
- #scrollToBeginning(int), #scrollToEnd(int), #scrollBackward(),
- #scrollForward().</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#swipeDown(int)">swipeDown</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe down action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#swipeLeft(int)">swipeLeft</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this object.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#swipeLeft(int)">swipeLeft</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe left action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#swipeRight(int)">swipeRight</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this object.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#swipeRight(int)">swipeRight</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe right action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#swipeUp(int)">swipeUp</a></span>(int steps)
-        
-        <div class="jd-descrdiv">Perform the action on the UI element that is represented by this UiObject.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#swipeUp(int)">swipeUp</a></span>(int steps)</nobr>
+
+        <div class="jd-descrdiv">Performs the swipe up action on the UiObject.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#waitForExists(long)">waitForExists</a></span>(long timeout)
-        
-        <div class="jd-descrdiv">Waits a specified length of time for a UI element to become visible.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#waitForExists(long)">waitForExists</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Waits a specified length of time for a view to become visible.</div>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="UiObject.html#waitUntilGone(long)">waitUntilGone</a></span>(long timeout)
-        
-        <div class="jd-descrdiv">Waits a specified length of time for a UI element to become undetectable.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="UiObject.html#waitUntilGone(long)">waitUntilGone</a></span>(long timeout)</nobr>
+
+        <div class="jd-descrdiv">Waits a specified length of time for a view to become undetectable.</div>
+
   </td></tr>
 
 
@@ -1352,7 +1602,7 @@
 
 
 
-<tr class="api apilevel-" >
+<tr class="api" >
 <td colspan="12">
   <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-java.lang.Object" class="jd-expando-trigger closed"
           ><img id="inherited-methods-java.lang.Object-trigger"
@@ -1368,150 +1618,182 @@
   </div>
   <div id="inherited-methods-java.lang.Object-summary" style="display: none;">
     <table class="jd-sumtable-expando">
-    
 
 
-	 
+
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Object</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">equals</span>(Object arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">clone</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">equals</span>(Object arg0)</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">finalize</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            Class&lt;?&gt;
+
+
+            Class&lt;?&gt;</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">getClass</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">getClass</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">hashCode</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">hashCode</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notify</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notify</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notifyAll</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notifyAll</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">toString</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">toString</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>()</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0, int arg1)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0, int arg1)</nobr>
+
   </td></tr>
 
 
-	 
+
     <tr class="api" >
-        <td class="jd-typecol">
-            
-            
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0)</nobr>
+
   </td></tr>
 
 
@@ -1555,41 +1837,37 @@
 
 
 
-<a id="UiScrollable(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="UiScrollable(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        
+        public
+
+
+
+
+
       </span>
       <span class="sympad">UiScrollable</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> container)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>UiScrollable is a <code><a href="UiCollection.html">UiCollection</a></code> and as such requires a <code><a href="UiSelector.html">UiSelector</a></code> to
- identify the container UI element of the scrollable collection. Further operations on
- the items in the container will require specifying UiSelector as an item selector.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Constructor.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>container</th>
-          <td>a <code><a href="UiSelector.html">UiSelector</a></code> selector
-</td>
+          <th>container</td>
+          <td>a <code><a href="UiSelector.html">UiSelector</a></code> selector to identify the scrollable
+     layout element.</td>
         </tr>
       </table>
   </div>
@@ -1613,40 +1891,42 @@
 
 
 
-<a id="flingBackward()"></a>
+<A NAME="flingBackward()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">flingBackward</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#scrollBackward(int)">scrollBackward(int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a backwards fling action with the default number of fling
+ steps (5). If the swipe direction is set to vertical,
+ then the swipe will be performed from top to bottom. If the swipe
+ direction is set to horizontal, then the swipes will be performed from
+ left to right. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if scrolled and false if the control can't scroll anymore
-</li></ul>
+      <ul class="nolist"><li>true if scrolled, and false if can't scroll anymore</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1658,40 +1938,42 @@
 </div>
 
 
-<a id="flingForward()"></a>
+<A NAME="flingForward()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">flingForward</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>A convenience version of <code><a href="#scrollForward(int)">scrollForward(int)</a></code>, performs a fling</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a forward fling with the default number of fling steps (5).
+ If the swipe direction is set to vertical, then the swipes will be
+ performed from bottom to top. If the swipe
+ direction is set to horizontal, then the swipes will be performed from
+ right to left. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if scrolled and false if the control can't scroll anymore
-</li></ul>
+      <ul class="nolist"><li>true if scrolled, false if can't scroll anymore</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1703,40 +1985,40 @@
 </div>
 
 
-<a id="flingToBeginning(int)"></a>
+<A NAME="flingToBeginning(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">flingToBeginning</span>
       <span class="normal">(int maxSwipes)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#scrollToBeginning(int, int)">scrollToBeginning(int, int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a fling gesture to reach the beginning of a scrollable layout element.
+ The beginning can be at the  top-most edge in the case of vertical controls, or
+ the left-most edge for horizontal controls. Make sure to take into
+ account devices configured with right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true on scrolled else false
-</li></ul>
+      <ul class="nolist"><li>true on scrolled else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1748,40 +2030,40 @@
 </div>
 
 
-<a id="flingToEnd(int)"></a>
+<A NAME="flingToEnd(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">flingToEnd</span>
       <span class="normal">(int maxSwipes)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#scrollToEnd(int, int)">scrollToEnd(int, int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a fling gesture to reach the end of a scrollable layout element.
+ The end can be at the  bottom-most edge in the case of vertical controls, or
+ the right-most edge for horizontal controls. Make sure to take into
+ account devices configured with right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true on scrolled else false
-</li></ul>
+      <ul class="nolist"><li>true on scrolled, else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1793,56 +2075,61 @@
 </div>
 
 
-<a id="getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)"></a>
+<A NAME="getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         <a href="UiObject.html">UiObject</a>
       </span>
       <span class="sympad">getChildByDescription</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> childPattern, String text, boolean allowScrollSearch)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription(UiSelector, String)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Searches for a child element in the present scrollable container.
+ The search first looks for a child element that matches the selector
+ you provided, then looks for the content-description in its children elements.
+ If both search conditions are fulfilled, the method returns a {@ link UiObject}
+ representing the element matching the selector (not the child element in its
+ subhierarchy containing the content-description).</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>childPattern</th>
-          <td><code><a href="UiSelector.html">UiSelector</a></code> selector of the child pattern to match and return</td>
+          <th>childPattern</td>
+          <td><code><a href="UiSelector.html">UiSelector</a></code> for a child in a scollable layout element</td>
         </tr>
         <tr>
-          <th>text</th>
-          <td>String may be a partial match for the content-description of a child element.</td>
+          <th>text</td>
+          <td>Content-description to find in the children of
+ the <code>childPattern</code> match (may be a partial match)</td>
         </tr>
         <tr>
-          <th>allowScrollSearch</th>
+          <th>allowScrollSearch</td>
           <td>set to true if scrolling is allowed</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> pointing at and instance of <code>childPattern</code></li></ul>
+      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> representing the child element that matches the search conditions</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1854,58 +2141,58 @@
 </div>
 
 
-<a id="getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)"></a>
+<A NAME="getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         <a href="UiObject.html">UiObject</a>
       </span>
       <span class="sympad">getChildByDescription</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> childPattern, String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Searches for child UI element within the constraints of this UiScrollable <code><a href="UiSelector.html">UiSelector</a></code>
- container. It looks for any child matching the <code>childPattern</code> argument within its
- hierarchy with a matching content-description text. The returned UiObject will represent the
- UI element matching the <code>childPattern</code> and not the sub element that matched the
- content description.</p>
- By default this operation will perform scroll search while attempting to find the UI element
+
+  <div class="jd-tagdata jd-tagdescr"><p>Searches for a child element in the present scrollable container.
+ The search first looks for a child element that matches the selector
+ you provided, then looks for the content-description in its children elements.
+ If both search conditions are fulfilled, the method returns a {@ link UiObject}
+ representing the element matching the selector (not the child element in its
+ subhierarchy containing the content-description). By default, this method performs a
+ scroll search.
  See <code><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)">getChildByDescription(UiSelector, String, boolean)</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>childPattern</th>
-          <td><code><a href="UiSelector.html">UiSelector</a></code> selector of the child pattern to match and return</td>
+          <th>childPattern</td>
+          <td><code><a href="UiSelector.html">UiSelector</a></code> for a child in a scollable layout element</td>
         </tr>
         <tr>
-          <th>text</th>
-          <td>String of the identifying child contents of of the <code>childPattern</code></td>
+          <th>text</td>
+          <td>Content-description to find in the children of
+ the <code>childPattern</code> match</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> pointing at and instance of <code>childPattern</code></li></ul>
+      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> representing the child element that matches the search conditions</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1917,56 +2204,53 @@
 </div>
 
 
-<a id="getChildByInstance(com.android.uiautomator.core.UiSelector, int)"></a>
+<A NAME="getChildByInstance(com.android.uiautomator.core.UiSelector, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         <a href="UiObject.html">UiObject</a>
       </span>
       <span class="sympad">getChildByInstance</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> childPattern, int instance)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Searches for child UI element within the constraints of this UiScrollable <code><a href="UiSelector.html">UiSelector</a></code>
- selector. It looks for any child matching the <code>childPattern</code> argument and
- return the <code>instance</code> specified. The operation is performed only on the visible
- items and no scrolling is performed in this case.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Searches for a child element in the present scrollable container that
+ matches the selector you provided. The search is performed without
+ scrolling and only on visible elements.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>childPattern</th>
-          <td><code><a href="UiSelector.html">UiSelector</a></code> selector of the child pattern to match and return</td>
+          <th>childPattern</td>
+          <td><code><a href="UiSelector.html">UiSelector</a></code> for a child in a scollable layout element</td>
         </tr>
         <tr>
-          <th>instance</th>
-          <td>int the desired matched instance of this <code>childPattern</code></td>
+          <th>instance</td>
+          <td>int number representing the occurance of
+ a <code>childPattern</code> match</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> pointing at and instance of <code>childPattern</code>
-</li></ul>
+      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> representing the child element that matches the search conditions</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -1978,56 +2262,59 @@
 </div>
 
 
-<a id="getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)"></a>
+<A NAME="getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         <a href="UiObject.html">UiObject</a>
       </span>
       <span class="sympad">getChildByText</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> childPattern, String text, boolean allowScrollSearch)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText(UiSelector, String)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Searches for a child element in the present scrollable container. The
+ search first looks for a child element that matches the
+ selector you provided, then looks for the text in its children elements.
+ If both search conditions are fulfilled, the method returns a {@ link UiObject}
+ representing the element matching the selector (not the child element in its
+ subhierarchy containing the text).</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>childPattern</th>
-          <td><code><a href="UiSelector.html">UiSelector</a></code> selector of the child pattern to match and return</td>
+          <th>childPattern</td>
+          <td><code><a href="UiSelector.html">UiSelector</a></code> selector for a child in a scrollable layout element</td>
         </tr>
         <tr>
-          <th>text</th>
-          <td>String of the identifying child contents of of the <code>childPattern</code></td>
+          <th>text</td>
+          <td>String to find in the children of the <code>childPattern</code> match</td>
         </tr>
         <tr>
-          <th>allowScrollSearch</th>
+          <th>allowScrollSearch</td>
           <td>set to true if scrolling is allowed</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> pointing at and instance of <code>childPattern</code></li></ul>
+      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> representing the child element that matches the search conditions</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2039,59 +2326,58 @@
 </div>
 
 
-<a id="getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)"></a>
+<A NAME="getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         <a href="UiObject.html">UiObject</a>
       </span>
       <span class="sympad">getChildByText</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> childPattern, String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Searches for child UI element within the constraints of this UiScrollable <code><a href="UiSelector.html">UiSelector</a></code>
- container. It looks for any child matching the <code>childPattern</code> argument that has
- a sub UI element anywhere within its sub hierarchy that has text attribute
- <code>text</code>. The returned UiObject will point at the <code>childPattern</code>
- instance that matched the search and not at the text matched sub element</p>
- By default this operation will perform scroll search while attempting to find the UI
- element.
+
+  <div class="jd-tagdata jd-tagdescr"><p>Searches for a child element in the present scrollable
+ container. The search first looks for a child element that matches the
+ selector you provided, then looks for the text in its children elements.
+ If both search conditions are fulfilled, the method returns a {@ link UiObject}
+ representing the element matching the selector (not the child element in its
+ subhierarchy containing the text). By default, this method performs a
+ scroll search.
  See <code><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String, boolean)">getChildByText(UiSelector, String, boolean)</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>childPattern</th>
-          <td><code><a href="UiSelector.html">UiSelector</a></code> selector of the child pattern to match and return</td>
+          <th>childPattern</td>
+          <td><code><a href="UiSelector.html">UiSelector</a></code> selector for a child in a scrollable layout element</td>
         </tr>
         <tr>
-          <th>text</th>
-          <td>String of the identifying child contents of of the <code>childPattern</code></td>
+          <th>text</td>
+          <td>String to find in the children of the <code>childPattern</code> match</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> pointing at and instance of <code>childPattern</code></li></ul>
+      <ul class="nolist"><li><code><a href="UiObject.html">UiObject</a></code> representing the child element that matches the search conditions</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
+
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2103,135 +2389,124 @@
 </div>
 
 
-<a id="getMaxSearchSwipes()"></a>
+<A NAME="getMaxSearchSwipes()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         int
       </span>
       <span class="sympad">getMaxSearchSwipes</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>#getChildByDescription(String, boolean) and #getChildByText(String, boolean)
- use an arguments that specifies if scrolling is allowed while searching for the UI element.
- The number of scrolls currently allowed to perform a search can be read by this method.
- See <code><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes(int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Gets the maximum number of scrolls allowed when performing a
+ scroll action in search of a child element.
+ See <code><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription(UiSelector, String)</a></code> and
+ <code><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText(UiSelector, String)</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>max value of the number of swipes currently allowed during a scroll search
-</li></ul>
+      <ul class="nolist"><li>max the number of search swipes to perform until giving up</li></ul>
   </div>
 
     </div>
 </div>
 
 
-<a id="getSwipeDeadZonePercentage()"></a>
+<A NAME="getSwipeDeadZonePercentage()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         double
       </span>
       <span class="sympad">getSwipeDeadZonePercentage</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Returns the percentage of a widget's size that's considered as a no touch zone when swiping.
 
- Dead zones are set as percentage of a widget's total width or height, denoting a margin
- around the swipable area of the widget. Swipes must start and
- end inside this margin.
-
- This is important when the widget being swiped may not respond to the swipe if
- started at a point too near to the edge. The default is 10% from either edge.</p></div>
+  <div class="jd-tagdata jd-tagdescr"><p>Returns the percentage of a widget's size that's considered as a no-touch
+ zone when swiping. The no-touch zone is set as a percentage of a widget's total
+ width or height, denoting a margin around the swipable area of the widget.
+ Swipes must start and end inside this margin. This is important when the
+ widget being swiped may not respond to the swipe if started at a point
+ too near to the edge. The default is 10% from either edge.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>a value between 0 and 1
-</li></ul>
+      <ul class="nolist"><li>a value between 0 and 1</li></ul>
   </div>
 
     </div>
 </div>
 
 
-<a id="scrollBackward(int)"></a>
+<A NAME="scrollBackward(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollBackward</span>
       <span class="normal">(int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform a scroll backward. If this list is set to vertical (see <code><a href="#setAsVerticalList()">setAsVerticalList()</a></code>
- default) then the swipes will be executed from the top to bottom. If this list is set
- to horizontal (see <code><a href="#setAsHorizontalList()">setAsHorizontalList()</a></code>) then the swipes will be executed from
- the left to right. Caution is required on devices configured with right to left languages
- like Arabic and Hebrew.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a backward scroll. If the swipe direction is set to vertical,
+ then the swipes will be performed from top to bottom. If the swipe
+ direction is set to horizontal, then the swipes will be performed from
+ left to right. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
-          <td>use steps to control the speed, so that it may be a scroll, or fling</td>
+          <th>steps</td>
+          <td>number of steps. Use this to control the speed of the scroll action.</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if scrolled and false if the control can't scroll anymore
-</li></ul>
+      <ul class="nolist"><li>true if scrolled, false if can't scroll anymore</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2243,40 +2518,42 @@
 </div>
 
 
-<a id="scrollBackward()"></a>
+<A NAME="scrollBackward()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollBackward</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#scrollBackward(int)">scrollBackward(int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a backward scroll with the default number of scroll steps (55).
+ If the swipe direction is set to vertical,
+ then the swipes will be performed from top to bottom. If the swipe
+ direction is set to horizontal, then the swipes will be performed from
+ left to right. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if scrolled and false if the control can't scroll anymore
-</li></ul>
+      <ul class="nolist"><li>true if scrolled, and false if can't scroll anymore</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2288,50 +2565,48 @@
 </div>
 
 
-<a id="scrollDescriptionIntoView(java.lang.String)"></a>
+<A NAME="scrollDescriptionIntoView(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollDescriptionIntoView</span>
       <span class="normal">(String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Performs a swipe Up on the UI element until the requested content-description
- is visible or until swipe attempts have been exhausted. See <code><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes(int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a forward scroll action on the scrollable layout element until
+ the content-description is found, or until swipe attempts have been exhausted.
+ See <code><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes(int)</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>text</th>
-          <td>to look for anywhere within the contents of this scrollable.</td>
+          <th>text</td>
+          <td>content-description to find within the contents of this scrollable layout element.</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if item us found else false
-</li></ul>
+      <ul class="nolist"><li>true if item is found; else, false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2343,40 +2618,42 @@
 </div>
 
 
-<a id="scrollForward()"></a>
+<A NAME="scrollForward()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollForward</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>A convenience version of <code><a href="#scrollForward(int)">scrollForward(int)</a></code>, performs a regular scroll</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a forward scroll with the default number of scroll steps (55).
+ If the swipe direction is set to vertical,
+ then the swipes will be performed from bottom to top. If the swipe
+ direction is set to horizontal, then the swipes will be performed from
+ right to left. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if scrolled and false if the control can't scroll anymore
-</li></ul>
+      <ul class="nolist"><li>true if scrolled, false if can't scroll anymore</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2388,53 +2665,50 @@
 </div>
 
 
-<a id="scrollForward(int)"></a>
+<A NAME="scrollForward(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollForward</span>
       <span class="normal">(int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform a scroll forward. If this list is set to vertical (see <code><a href="#setAsVerticalList()">setAsVerticalList()</a></code>
- default) then the swipes will be executed from the bottom to top. If this list is set
- to horizontal (see <code><a href="#setAsHorizontalList()">setAsHorizontalList()</a></code>) then the swipes will be executed from
- the right to left. Caution is required on devices configured with right to left languages
- like Arabic and Hebrew.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a forward scroll. If the swipe direction is set to vertical,
+ then the swipes will be performed from bottom to top. If the swipe
+ direction is set to horizontal, then the swipes will be performed from
+ right to left. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
-          <td>use steps to control the speed, so that it may be a scroll, or fling</td>
+          <th>steps</td>
+          <td>number of steps. Use this to control the speed of the scroll action</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if scrolled and false if the control can't scroll anymore
-</li></ul>
+      <ul class="nolist"><li>true if scrolled, false if can't scroll anymore</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2446,50 +2720,49 @@
 </div>
 
 
-<a id="scrollIntoView(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="scrollIntoView(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollIntoView</span>
       <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Perform a scroll search for a UI element matching the <code><a href="UiSelector.html">UiSelector</a></code> selector argument.
+
+  <div class="jd-tagdata jd-tagdescr"><p>Perform a scroll forward action to move through the scrollable layout
+ element until a visible item that matches the selector is found.
+
  See <code><a href="#scrollDescriptionIntoView(java.lang.String)">scrollDescriptionIntoView(String)</a></code> and <code><a href="#scrollTextIntoView(java.lang.String)">scrollTextIntoView(String)</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>selector</th>
+          <th>selector</td>
           <td><code><a href="UiSelector.html">UiSelector</a></code> selector</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if the item was found and now is in view else false
-</li></ul>
+      <ul class="nolist"><li>true if the item was found and now is in view; else, false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2501,50 +2774,100 @@
 </div>
 
 
-<a id="scrollTextIntoView(java.lang.String)"></a>
+<A NAME="scrollIntoView(com.android.uiautomator.core.UiObject)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">scrollIntoView</span>
+      <span class="normal">(<a href="UiObject.html">UiObject</a> obj)</span>
+    </h4>
+      <div class="api-level">
+        <div></div>
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Perform a forward scroll action to move through the scrollable layout element until
+ a visible item that matches the <code><a href="UiObject.html">UiObject</a></code> is found.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>obj</td>
+          <td><code><a href="UiObject.html">UiObject</a></code></td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if the item was found and now is in view else false</li></ul>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Throws</h5>
+      <table class="jd-tagtable">
+        <tr>
+            <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
+            <td></td>
+        </tr>
+      </table>
+  </div>
+
+    </div>
+</div>
+
+
+<A NAME="scrollTextIntoView(java.lang.String)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollTextIntoView</span>
       <span class="normal">(String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Performs a swipe up on the UI element until the requested text is visible
- or until swipe attempts have been exhausted. See <code><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes(int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Performs a forward scroll action on the scrollable layout element until
+ the text you provided is visible, or until swipe attempts have been exhausted.
+ See <code><a href="#setMaxSearchSwipes(int)">setMaxSearchSwipes(int)</a></code></p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>text</th>
-          <td>to look for</td>
+          <th>text</td>
+          <td>test to look for</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true if item us found else false
-</li></ul>
+      <ul class="nolist"><li>true if item is found; else, false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2556,40 +2879,40 @@
 </div>
 
 
-<a id="scrollToBeginning(int)"></a>
+<A NAME="scrollToBeginning(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollToBeginning</span>
       <span class="normal">(int maxSwipes)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See <code><a href="#scrollToBeginning(int, int)">scrollToBeginning(int, int)</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Scrolls to the beginning of a scrollable layout element. The beginning
+ can be at the  top-most edge in the case of vertical controls, or the
+ left-most edge for horizontal controls. Make sure to take into account
+ devices configured with right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true on scrolled else false
-</li></ul>
+      <ul class="nolist"><li>true on scrolled else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2601,51 +2924,49 @@
 </div>
 
 
-<a id="scrollToBeginning(int, int)"></a>
+<A NAME="scrollToBeginning(int, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollToBeginning</span>
       <span class="normal">(int maxSwipes, int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Scrolls to the beginning of a scrollable UI element. The beginning could be the top most
- in case of vertical lists or the left most in case of horizontal lists. Caution is required
- on devices configured with right to left languages like Arabic and Hebrew.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Scrolls to the beginning of a scrollable layout element. The beginning
+ can be at the  top-most edge in the case of vertical controls, or the
+ left-most edge for horizontal controls. Make sure to take into account
+ devices configured with right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>use steps to control the speed, so that it may be a scroll, or fling</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true on scrolled else false
-</li></ul>
+      <ul class="nolist"><li>true on scrolled else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2657,51 +2978,49 @@
 </div>
 
 
-<a id="scrollToEnd(int, int)"></a>
+<A NAME="scrollToEnd(int, int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollToEnd</span>
       <span class="normal">(int maxSwipes, int steps)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Scrolls to the end of a scrollable UI element. The end could be the bottom most
- in case of vertical controls or the right most for horizontal controls. Caution
- is required on devices configured with right to left languages like Arabic and Hebrew.</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Scrolls to the end of a scrollable layout element. The end can be at the
+ bottom-most edge in the case of vertical controls, or the right-most edge for
+ horizontal controls. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>steps</th>
+          <th>steps</td>
           <td>use steps to control the speed, so that it may be a scroll, or fling</td>
         </tr>
       </table>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true on scrolled else false
-</li></ul>
+      <ul class="nolist"><li>true on scrolled else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2713,40 +3032,40 @@
 </div>
 
 
-<a id="scrollToEnd(int)"></a>
+<A NAME="scrollToEnd(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         boolean
       </span>
       <span class="sympad">scrollToEnd</span>
       <span class="normal">(int maxSwipes)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>See {@link UiScrollable#scrollToEnd(int, int)</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Scrolls to the end of a scrollable layout element. The end can be at the
+ bottom-most edge in the case of vertical controls, or the right-most edge for
+ horizontal controls. Make sure to take into account devices configured with
+ right-to-left languages like Arabic and Hebrew.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>true on scrolled else false
-</li></ul>
+      <ul class="nolist"><li>true on scrolled, else false</li></ul>
   </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Throws</h5>
-      <table class="jd-tagtable">  
+      <table class="jd-tagtable">
         <tr>
             <th><a href="UiObjectNotFoundException.html">UiObjectNotFoundException</a></td>
             <td></td>
@@ -2758,157 +3077,207 @@
 </div>
 
 
-<a id="setAsHorizontalList()"></a>
+<A NAME="setAsHorizontalList()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        void
+        public
+
+
+
+
+        <a href="#">UiScrollable</a>
       </span>
       <span class="sympad">setAsHorizontalList</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Set the direction of swipes when performing scroll search
-</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Set the direction of swipes to be horizontal when performing scroll actions.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>reference to itself</li></ul>
+  </div>
 
     </div>
 </div>
 
 
-<a id="setAsVerticalList()"></a>
+<A NAME="setAsVerticalList()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        void
+        public
+
+
+
+
+        <a href="#">UiScrollable</a>
       </span>
       <span class="sympad">setAsVerticalList</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Set the direction of swipes when performing scroll search
-</p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Set the direction of swipes to be vertical when performing scroll actions.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>reference to itself</li></ul>
+  </div>
 
     </div>
 </div>
 
 
-<a id="setMaxSearchSwipes(int)"></a>
+<A NAME="setMaxSearchSwipes(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        void
+        public
+
+
+
+
+        <a href="#">UiScrollable</a>
       </span>
       <span class="sympad">setMaxSearchSwipes</span>
       <span class="normal">(int swipes)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>#getChildByDescription(String, boolean) and #getChildByText(String, boolean)
- use an arguments that specifies if scrolling is allowed while searching for the UI element.
- The number of scrolls allowed to perform a search can be modified by this method.
- The current value can be read by calling <code><a href="#getMaxSearchSwipes()">getMaxSearchSwipes()</a></code></p></div>
+
+  <div class="jd-tagdata jd-tagdescr"><p>Sets the maximum number of scrolls allowed when performing a
+ scroll action in search of a child element.
+ See <code><a href="#getChildByDescription(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByDescription(UiSelector, String)</a></code> and
+ <code><a href="#getChildByText(com.android.uiautomator.core.UiSelector, java.lang.String)">getChildByText(UiSelector, String)</a></code>.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>swipes</th>
-          <td>is the number of search swipes until abort
-</td>
+          <th>swipes</td>
+          <td>the number of search swipes to perform until giving up</td>
         </tr>
       </table>
   </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>reference to itself</li></ul>
+  </div>
 
     </div>
 </div>
 
 
-<a id="setSwipeDeadZonePercentage(double)"></a>
+<A NAME="setSwipeDeadZonePercentage(double)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        void
+        public
+
+
+
+
+        <a href="#">UiScrollable</a>
       </span>
       <span class="sympad">setSwipeDeadZonePercentage</span>
       <span class="normal">(double swipeDeadZonePercentage)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Sets the percentage of a widget's size that's considered as a no touch zone when swiping.
 
- Dead zones are set as percentage of a widget's total width or height, denoting a margin
- around the swipable area of the widget. Swipes must always start and
- end inside this margin.
-
- This is important when the widget being swiped may not respond to the swipe if
- started at a point too near to the edge. The default is 10% from either edge</p></div>
+  <div class="jd-tagdata jd-tagdescr"><p>Sets the percentage of a widget's size that's considered as no-touch
+ zone when swiping.
+ The no-touch zone is set as percentage of a widget's total width or height,
+ denoting a margin around the swipable area of the widget. Swipes must
+ always start and end inside this margin. This is important when the
+ widget being swiped may not respond to the swipe if started at a point
+ too near to the edge. The default is 10% from either edge.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>swipeDeadZonePercentage</th>
-          <td>is a value between 0 and 1
-</td>
+          <th>swipeDeadZonePercentage</td>
+          <td>is a value between 0 and 1</td>
         </tr>
       </table>
   </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>reference to itself</li></ul>
+  </div>
 
     </div>
 </div>
+
+
+
+
+
+<!-- ========= METHOD DETAIL ======== -->
+
+<h2>Protected Methods</h2>
+
+
+
+<A NAME="exists(com.android.uiautomator.core.UiSelector)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+
+
+
+
+        boolean
+      </span>
+      <span class="sympad">exists</span>
+      <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
+    </h4>
+      <div class="api-level">
+        <div></div>
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Used privately when performing swipe searches to decide if an element has become
+ visible or not.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>true if found else false</li></ul>
+  </div>
+
+    </div>
+
+
+
+
+
diff --git a/docs/html/tools/help/uiautomator/UiSelector.jd b/docs/html/tools/help/uiautomator/UiSelector.jd
index 96d3fd8..c9a1eed 100644
--- a/docs/html/tools/help/uiautomator/UiSelector.jd
+++ b/docs/html/tools/help/uiautomator/UiSelector.jd
@@ -5,40 +5,10 @@
 <style>
     h4.jd-details-title {background-color: #DEE8F1;}
 </style>
-
-
-<h2>Class Overview</h2>
-<p>This class provides the mechanism for tests to describe the UI elements they
- intend to target. A UI element has many properties associated with it such as
- text value, content-description, class name and multiple state information like
- selected, enabled, checked etc. Additionally UiSelector allows targeting of UI
- elements within a specific display hierarchies to distinguish similar elements
- based in the hierarchies they're in.</p>
-
-
-
-
-
-</div><!-- jd-descr -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="jd-descr">
-
-
+<p>Specifies the elements in the layout hierarchy for tests to target, filtered
+by properties such as text value, content-description, class name, and state
+information. You can also target an element by its location in a layout
+hierarchy.</p>
 <h2>Summary</h2>
 
 
@@ -68,19 +38,19 @@
 
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            </nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#UiSelector()">UiSelector</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#UiSelector()">UiSelector</a></span>()</nobr>
+
   </td></tr>
 
 
@@ -97,486 +67,542 @@
 
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#checked(boolean)">checked</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#checkable(boolean)">checkable</a></span>(boolean val)</nobr>
+
+        <div class="jd-descrdiv">Set the search criteria to match widgets that are checkable.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#checked(boolean)">checked</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that
  are currently checked (usually for checkboxes).</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#childSelector(com.android.uiautomator.core.UiSelector)">childSelector</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#childSelector(com.android.uiautomator.core.UiSelector)">childSelector</a></span>(<a href="#">UiSelector</a> selector)</nobr>
+
         <div class="jd-descrdiv">Adds a child UiSelector criteria to this selector.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#className(java.lang.String)">className</a></span>(String className)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#className(java.lang.String)">className</a></span>(String className)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the class property
  for a widget (for example, "android.widget.Button").</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
             &lt;T&gt;
-            <a href="UiSelector.html">UiSelector</a>
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#className(java.lang.Class<T>)">className</a></span>(Class&lt;T&gt; type)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#className(java.lang.Class<T>)">className</a></span>(Class&lt;T&gt; type)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the class property
  for a widget (for example, "android.widget.Button").</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#classNameMatches(java.lang.String)">classNameMatches</a></span>(String regex)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#classNameMatches(java.lang.String)">classNameMatches</a></span>(String regex)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the class property
- for a widget (for example, "android.widget.Button").</div>
-  
+ for a widget, using a regular expression.</div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#clickable(boolean)">clickable</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#clickable(boolean)">clickable</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that are clickable.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#description(java.lang.String)">description</a></span>(String desc)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#description(java.lang.String)">description</a></span>(String desc)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the content-description
  property for a widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#descriptionContains(java.lang.String)">descriptionContains</a></span>(String desc)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#descriptionContains(java.lang.String)">descriptionContains</a></span>(String desc)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the content-description
  property for a widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#descriptionMatches(java.lang.String)">descriptionMatches</a></span>(String regex)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#descriptionMatches(java.lang.String)">descriptionMatches</a></span>(String regex)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the content-description
  property for a widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#descriptionStartsWith(java.lang.String)">descriptionStartsWith</a></span>(String desc)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#descriptionStartsWith(java.lang.String)">descriptionStartsWith</a></span>(String desc)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the content-description
  property for a widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#enabled(boolean)">enabled</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#enabled(boolean)">enabled</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that are enabled.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#focusable(boolean)">focusable</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#focusable(boolean)">focusable</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that are focusable.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#focused(boolean)">focused</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#focused(boolean)">focused</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that have focus.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#fromParent(com.android.uiautomator.core.UiSelector)">fromParent</a></span>(<a href="UiSelector.html">UiSelector</a> selector)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#fromParent(com.android.uiautomator.core.UiSelector)">fromParent</a></span>(<a href="#">UiSelector</a> selector)</nobr>
+
         <div class="jd-descrdiv">Adds a child UiSelector criteria to this selector which is used to
  start search from the parent widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#index(int)">index</a></span>(int index)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#index(int)">index</a></span>(int index)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the widget by its node
  index in the layout hierarchy.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#instance(int)">instance</a></span>(int instance)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#instance(int)">instance</a></span>(int instance)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the
  widget by its instance number.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#longClickable(boolean)">longClickable</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#longClickable(boolean)">longClickable</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that are long-clickable.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#packageName(java.lang.String)">packageName</a></span>(String name)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#packageName(java.lang.String)">packageName</a></span>(String name)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the package name
  of the application that contains the widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#packageNameMatches(java.lang.String)">packageNameMatches</a></span>(String regex)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#packageNameMatches(java.lang.String)">packageNameMatches</a></span>(String regex)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the package name
  of the application that contains the widget.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#scrollable(boolean)">scrollable</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#resourceId(java.lang.String)">resourceId</a></span>(String id)</nobr>
+
+        <div class="jd-descrdiv">Set the search criteria to match the given resource ID.</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#resourceIdMatches(java.lang.String)">resourceIdMatches</a></span>(String regex)</nobr>
+
+        <div class="jd-descrdiv">Set the search criteria to match the resource ID
+ of the widget, using a regular expression.http://blog.bettersoftwaretesting.com/</div>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#scrollable(boolean)">scrollable</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that are scrollable.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#selected(boolean)">selected</a></span>(boolean val)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#selected(boolean)">selected</a></span>(boolean val)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match widgets that
  are currently selected.</div>
-  
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#text(java.lang.String)">text</a></span>(String text)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#text(java.lang.String)">text</a></span>(String text)</nobr>
+
         <div class="jd-descrdiv">Set the search criteria to match the visible text displayed
- for a widget (for example, the text label to launch an app).</div>
-  
+ in a widget (for example, the text label to launch an app).</div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#textContains(java.lang.String)">textContains</a></span>(String text)
-        
-        <div class="jd-descrdiv">Set the search criteria to match the visible text displayed
- for a widget (for example, the text label to launch an app).</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#textContains(java.lang.String)">textContains</a></span>(String text)</nobr>
+
+        <div class="jd-descrdiv">Set the search criteria to match the visible text in a widget
+ where the visible text must contain the string in your input argument.</div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#textMatches(java.lang.String)">textMatches</a></span>(String regex)
-        
-        <div class="jd-descrdiv">Set the search criteria to match the visible text displayed
- for a widget (for example, the text label to launch an app).</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#textMatches(java.lang.String)">textMatches</a></span>(String regex)</nobr>
+
+        <div class="jd-descrdiv">Set the search criteria to match the visible text displayed in a layout
+ element, using a regular expression.</div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            <a href="UiSelector.html">UiSelector</a>
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#textStartsWith(java.lang.String)">textStartsWith</a></span>(String text)
-        
-        <div class="jd-descrdiv">Text property is usually the widget's visible text on the display.</div>
-  
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#textStartsWith(java.lang.String)">textStartsWith</a></span>(String text)</nobr>
+
+        <div class="jd-descrdiv">Set the search criteria to match visible text in a widget that is
+ prefixed by the text parameter.</div>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad"><a href="#toString()">toString</a></span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#toString()">toString</a></span>()</nobr>
+
   </td></tr>
 
 
@@ -586,6 +612,31 @@
 
 
 
+<!-- ========== METHOD SUMMARY =========== -->
+<table id="promethods" class="jd-sumtable"><tr><th colspan="12">Protected Methods</th></tr>
+
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            <a href="#">UiSelector</a></nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad"><a href="#cloneSelector()">cloneSelector</a></span>()</nobr>
+
+  </td></tr>
+
+
+
+</table>
+
+
 
 
 
@@ -595,7 +646,7 @@
   <div style="clear:left;">Inherited Methods</div></th></tr>
 
 
-<tr class="api apilevel-" >
+<tr class="api" >
 <td colspan="12">
   <a href="#" onclick="return toggleInherited(this, null)" id="inherited-methods-java.lang.Object" class="jd-expando-trigger closed"
           ><img id="inherited-methods-java.lang.Object-trigger"
@@ -611,150 +662,182 @@
   </div>
   <div id="inherited-methods-java.lang.Object-summary" style="display: none;">
     <table class="jd-sumtable-expando">
-    
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            boolean
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            Object</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">equals</span>(Object arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">clone</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            boolean</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">equals</span>(Object arg0)</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            void</nobr>
+        </td>
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">finalize</span>()</nobr>
+
+  </td></tr>
+
+
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            Class&lt;?&gt;
+
+
+            Class&lt;?&gt;</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">getClass</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">getClass</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            int
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            int</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">hashCode</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">hashCode</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notify</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notify</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">notifyAll</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">notifyAll</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
-            
-            
-            
-            String
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
+
+
+
+            String</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">toString</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">toString</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>()
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>()</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0, int arg1)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0, int arg1)</nobr>
+
   </td></tr>
 
 
-	 
-    <tr class="api">
-        <td class="jd-typecol">
-            
-            
+
+    <tr class="api" >
+        <td class="jd-typecol"><nobr>
+
+
             final
-            
-            
-            void
+
+
+            void</nobr>
         </td>
-        <td class="jd-linkcol" width="100%">
-        <span class="sympad">wait</span>(long arg0)
-        
+        <td class="jd-linkcol" width="100%"><nobr>
+        <span class="sympad">wait</span>(long arg0)</nobr>
+
   </td></tr>
 
 
@@ -798,31 +881,29 @@
 
 
 
-<a id="UiSelector()"></a>
+<A NAME="UiSelector()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        
+        public
+
+
+
+
+
       </span>
       <span class="sympad">UiSelector</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p></p></div>
 
     </div>
@@ -844,31 +925,76 @@
 
 
 
-<a id="checked(boolean)"></a>
+<A NAME="checkable(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
+      </span>
+      <span class="sympad">checkable</span>
+      <span class="normal">(boolean val)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that are checkable.
+
+ Typically, using this search criteria alone is not useful.
+ You should also include additional criteria, such as text,
+ content-description, or the class name for a widget.
+
+ If no other search criteria is specified, and there is more
+ than one matching widget, the first widget in the tree
+ is selected.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>val</td>
+          <td>Value to match</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="checked(boolean)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">checked</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that
  are currently checked (usually for checkboxes).
 
@@ -883,7 +1009,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -897,31 +1023,29 @@
 </div>
 
 
-<a id="childSelector(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="childSelector(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">childSelector</span>
-      <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
+      <span class="normal">(<a href="#">UiSelector</a> selector)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Adds a child UiSelector criteria to this selector.
 
  Use this selector to narrow the search scope to
@@ -935,38 +1059,30 @@
 </div>
 
 
-<a id="className(java.lang.String)"></a>
+<A NAME="className(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">className</span>
       <span class="normal">(String className)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the class property
  for a widget (for example, "android.widget.Button").</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>className</th>
+          <th>className</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -975,114 +1091,120 @@
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="className(java.lang.Class<T>)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
+      </span>
+      <span class="sympad">className</span>
+      <span class="normal">(Class&lt;T&gt; type)</span>
+    </h4>
+      <div class="api-level">
+        <div></div>
+
+
+
+      </div>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the class property
+ for a widget (for example, "android.widget.Button").</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>type</td>
+          <td>type</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
+  </div>
 
     </div>
 </div>
 
 
-<a id="className(java.lang.Class<T>)"></a>
+<A NAME="classNameMatches(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
-      </span>
-      <span class="sympad">className</span>
-      <span class="normal">(Class&lt;T&gt; type)</span>
-    </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
-    <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the class property
- for a widget (for example, "android.widget.Button").</p></div>
-  <div class="jd-tagdata">
-      <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
-  </div>
-  <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
-    </div>
-</div>
+        public
 
 
-<a id="classNameMatches(java.lang.String)"></a>
 
-<div class="jd-details api "> 
-    <h4 class="jd-details-title">
-      <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">classNameMatches</span>
       <span class="normal">(String regex)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the class property
- for a widget (for example, "android.widget.Button").</p></div>
+ for a widget, using a regular expression.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>regex</td>
+          <td>a regular expression</td>
+        </tr>
+      </table>
+  </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="clickable(boolean)"></a>
+<A NAME="clickable(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">clickable</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that are clickable.
 
  Typically, using this search criteria alone is not useful.
@@ -1096,7 +1218,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1110,31 +1232,29 @@
 </div>
 
 
-<a id="description(java.lang.String)"></a>
+<A NAME="description(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">description</span>
       <span class="normal">(String desc)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the content-description
  property for a widget.
 
@@ -1150,7 +1270,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>desc</th>
+          <th>desc</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1164,31 +1284,29 @@
 </div>
 
 
-<a id="descriptionContains(java.lang.String)"></a>
+<A NAME="descriptionContains(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">descriptionContains</span>
       <span class="normal">(String desc)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the content-description
  property for a widget.
 
@@ -1204,7 +1322,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>desc</th>
+          <th>desc</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1218,31 +1336,23 @@
 </div>
 
 
-<a id="descriptionMatches(java.lang.String)"></a>
+<A NAME="descriptionMatches(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">descriptionMatches</span>
       <span class="normal">(String regex)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the content-description
  property for a widget.
 
@@ -1253,42 +1363,49 @@
  for the widget must match exactly
  with the string in your input argument.</p></div>
   <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>regex</td>
+          <td>a regular expression</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="descriptionStartsWith(java.lang.String)"></a>
+<A NAME="descriptionStartsWith(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">descriptionStartsWith</span>
       <span class="normal">(String desc)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the content-description
  property for a widget.
 
@@ -1304,7 +1421,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>desc</th>
+          <th>desc</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1318,31 +1435,29 @@
 </div>
 
 
-<a id="enabled(boolean)"></a>
+<A NAME="enabled(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">enabled</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that are enabled.
 
  Typically, using this search criteria alone is not useful.
@@ -1356,7 +1471,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1370,31 +1485,29 @@
 </div>
 
 
-<a id="focusable(boolean)"></a>
+<A NAME="focusable(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">focusable</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that are focusable.
 
  Typically, using this search criteria alone is not useful.
@@ -1408,7 +1521,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1422,31 +1535,29 @@
 </div>
 
 
-<a id="focused(boolean)"></a>
+<A NAME="focused(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">focused</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that have focus.
 
  Typically, using this search criteria alone is not useful.
@@ -1460,7 +1571,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1474,31 +1585,29 @@
 </div>
 
 
-<a id="fromParent(com.android.uiautomator.core.UiSelector)"></a>
+<A NAME="fromParent(com.android.uiautomator.core.UiSelector)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">fromParent</span>
-      <span class="normal">(<a href="UiSelector.html">UiSelector</a> selector)</span>
+      <span class="normal">(<a href="#">UiSelector</a> selector)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Adds a child UiSelector criteria to this selector which is used to
  start search from the parent widget.
 
@@ -1513,31 +1622,29 @@
 </div>
 
 
-<a id="index(int)"></a>
+<A NAME="index(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">index</span>
       <span class="normal">(int index)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the widget by its node
  index in the layout hierarchy.
 
@@ -1550,7 +1657,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>index</th>
+          <th>index</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1564,31 +1671,29 @@
 </div>
 
 
-<a id="instance(int)"></a>
+<A NAME="instance(int)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">instance</span>
       <span class="normal">(int instance)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the
  widget by its instance number.
 
@@ -1609,7 +1714,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>instance</th>
+          <th>instance</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1623,31 +1728,23 @@
 </div>
 
 
-<a id="longClickable(boolean)"></a>
+<A NAME="longClickable(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">longClickable</span>
       <span class="normal">(boolean val)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that are long-clickable.
 
  Typically, using this search criteria alone is not useful.
@@ -1661,7 +1758,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1671,45 +1768,43 @@
       <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="packageName(java.lang.String)"></a>
+<A NAME="packageName(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">packageName</span>
       <span class="normal">(String name)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the package name
  of the application that contains the widget.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>name</th>
+          <th>name</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1723,70 +1818,148 @@
 </div>
 
 
-<a id="packageNameMatches(java.lang.String)"></a>
+<A NAME="packageNameMatches(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">packageNameMatches</span>
       <span class="normal">(String regex)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the package name
  of the application that contains the widget.</p></div>
   <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>regex</td>
+          <td>a regular expression</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="scrollable(boolean)"></a>
+<A NAME="resourceId(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
+      </span>
+      <span class="sympad">resourceId</span>
+      <span class="normal">(String id)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the given resource ID.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>id</td>
+          <td>Value to match</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="resourceIdMatches(java.lang.String)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
+      </span>
+      <span class="sympad">resourceIdMatches</span>
+      <span class="normal">(String regex)</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the resource ID
+ of the widget, using a regular expression.http://blog.bettersoftwaretesting.com/</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>regex</td>
+          <td>a regular expression</td>
+        </tr>
+      </table>
+  </div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Returns</h5>
+      <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
+  </div>
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 18</li></ul>
+  </div>
+    </div>
+</div>
+
+
+<A NAME="scrollable(boolean)"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">scrollable</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that are scrollable.
 
  Typically, using this search criteria alone is not useful.
@@ -1800,7 +1973,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1814,31 +1987,29 @@
 </div>
 
 
-<a id="selected(boolean)"></a>
+<A NAME="selected(boolean)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">selected</span>
       <span class="normal">(boolean val)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match widgets that
  are currently selected.
 
@@ -1853,7 +2024,7 @@
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>val</th>
+          <th>val</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1867,42 +2038,39 @@
 </div>
 
 
-<a id="text(java.lang.String)"></a>
+<A NAME="text(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">text</span>
       <span class="normal">(String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the visible text displayed
- for a widget (for example, the text label to launch an app).
 
- The text for the widget must match exactly
- with the string in your input argument.
- Matching is case-sensitive.</p></div>
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the visible text displayed
+ in a widget (for example, the text label to launch an app).
+
+ The text for the element must match exactly with the string in your input
+ argument. Matching is case-sensitive.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>text</th>
+          <th>text</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1916,41 +2084,38 @@
 </div>
 
 
-<a id="textContains(java.lang.String)"></a>
+<A NAME="textContains(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">textContains</span>
       <span class="normal">(String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the visible text displayed
- for a widget (for example, the text label to launch an app).
 
- The text for the widget must contain the string in
- your input argument. Matching is case-sensitive.</p></div>
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the visible text in a widget
+ where the visible text must contain the string in your input argument.
+
+ The matching is case-sensitive.</p></div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Parameters</h5>
       <table class="jd-tagtable">
         <tr>
-          <th>text</th>
+          <th>text</td>
           <td>Value to match</td>
         </tr>
       </table>
@@ -1964,113 +2129,117 @@
 </div>
 
 
-<a id="textMatches(java.lang.String)"></a>
+<A NAME="textMatches(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">textMatches</span>
       <span class="normal">(String regex)</span>
     </h4>
-      <div class="api-level">
-        <div>
-
-</div>
-        
-  
-
-      </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the visible text displayed
- for a widget (for example, the text label to launch an app).
 
- The text for the widget must match exactly
- with the string in your input argument.</p></div>
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match the visible text displayed in a layout
+ element, using a regular expression.
+
+ The text in the widget must match exactly with the string in your
+ input argument.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>regex</td>
+          <td>a regular expression</td>
+        </tr>
+      </table>
+  </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
       <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
   <div class="jd-tagdata">
-  <h5 class="jd-tagtitle">Since</h5>
-  <ul class="nolist"><li>Android API Level 17</li></ul>
-</div>
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
     </div>
 </div>
 
 
-<a id="textStartsWith(java.lang.String)"></a>
+<A NAME="textStartsWith(java.lang.String)"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
-        <a href="UiSelector.html">UiSelector</a>
+        public
+
+
+
+
+        <a href="#">UiSelector</a>
       </span>
       <span class="sympad">textStartsWith</span>
       <span class="normal">(String text)</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
-  <div class="jd-tagdata jd-tagdescr"><p>Text property is usually the widget's visible text on the display.
 
- Adding this to the search criteria indicates that the search performed
- should match a widget with text value starting with the text parameter.
+  <div class="jd-tagdata jd-tagdescr"><p>Set the search criteria to match visible text in a widget that is
+ prefixed by the text parameter.
 
- The matching will be case-insensitive.</p></div>
+ The matching is case-insensitive.</p></div>
+  <div class="jd-tagdata">
+      <h5 class="jd-tagtitle">Parameters</h5>
+      <table class="jd-tagtable">
+        <tr>
+          <th>text</td>
+          <td>Value to match</td>
+        </tr>
+      </table>
+  </div>
   <div class="jd-tagdata">
       <h5 class="jd-tagtitle">Returns</h5>
-      <ul class="nolist"><li>UiSelector with this added search criterion</li></ul>
+      <ul class="nolist"><li>UiSelector with the specified search criteria</li></ul>
   </div>
 
     </div>
 </div>
 
 
-<a id="toString()"></a>
+<A NAME="toString()"></A>
 
-<div class="jd-details api "> 
+<div class="jd-details api">
     <h4 class="jd-details-title">
       <span class="normal">
-        public 
-         
-         
-         
-         
+        public
+
+
+
+
         String
       </span>
       <span class="sympad">toString</span>
       <span class="normal">()</span>
     </h4>
       <div class="api-level">
-        <div>
+        <div></div>
 
-</div>
-        
-  
+
 
       </div>
     <div class="jd-details-descr">
-      
+
   <div class="jd-tagdata jd-tagdescr"><p></p></div>
 
     </div>
@@ -2082,7 +2251,36 @@
 
 <!-- ========= METHOD DETAIL ======== -->
 
+<h2>Protected Methods</h2>
 
 
-<!-- ========= END OF CLASS DATA ========= -->
+
+<A NAME="cloneSelector()"></A>
+
+<div class="jd-details api">
+    <h4 class="jd-details-title">
+      <span class="normal">
+        protected
+
+
+
+
+        <a href="#">UiSelector</a>
+      </span>
+      <span class="sympad">cloneSelector</span>
+      <span class="normal">()</span>
+    </h4>
+    <div class="jd-details-descr">
+
+  <div class="jd-tagdata">
+     <h5 class="jd-tagtitle">Since</h5>
+     <ul class="nolist"><li>Android API Level 17</li></ul>
+  </div>
+
+    </div>
+
+
+
+
+
 
diff --git a/docs/html/tools/help/uiautomator/UiWatcher.jd b/docs/html/tools/help/uiautomator/UiWatcher.jd
index b416fad..9268c35 100644
--- a/docs/html/tools/help/uiautomator/UiWatcher.jd
+++ b/docs/html/tools/help/uiautomator/UiWatcher.jd
@@ -9,9 +9,6 @@
 <p>Represents a conditional watcher on the target device. To learn how to register a conditional 
  watcher, see <code><a href="UiDevice.html#registerWatcher(java.lang.String, com.android.uiautomator.core.UiWatcher)">UiDevice.registerWatcher()</a></code>.
 </p>
-
-<div class="jd-descr">
-
 <h2>Summary</h2>
 
 <!-- ========== METHOD SUMMARY =========== -->
@@ -75,4 +72,3 @@
   </div>
 
     </div>
-</div>
diff --git a/docs/html/tools/help/uiautomator/index.jd b/docs/html/tools/help/uiautomator/index.jd
index e3899d6..4b3c255 100644
--- a/docs/html/tools/help/uiautomator/index.jd
+++ b/docs/html/tools/help/uiautomator/index.jd
@@ -26,7 +26,7 @@
 <h2 id="syntax">Syntax</h2>
 <p>To run your testcases on the target device, you can use the {@code adb shell} command to invoke the {@code uiautomator} tool.  The syntax is:
 <pre>
-adb shell uiautomator runtest &lt;jar&gt; -c &lt;test_class_or_method&gt; [options]
+adb shell uiautomator runtest &lt;JARS&gt; -c &lt;CLASSES&gt; [options]
 </pre>
 </p>
 <p>Here’s an example:</p>
@@ -45,19 +45,26 @@
 </tr>
 
 <tr>
-<td rowspan="6"><code>runtest</code></td>
-<td><nobr>{@code &lt;jar&gt;}</nobr></td>
-<td><strong>Required</strong>. The {@code &lt;jar&gt;} argument is the name of one or more JAR files that you deployed to the target device which contain your uiautomator testcases. You can list more than one JAR file by using a space as a separator.</td>
+<td rowspan="7"><code>runtest</code></td>
+<td><nobr>{@code &lt;JARS&gt;}</nobr></td>
+<td><strong>Required</strong>. The {@code &lt;JARS&gt;} argument is the name of one or more JAR files that you deployed to the target device which contain your uiautomator testcases. You can list more than one JAR file by using a space as a separator.</td>
 </tr>
 
 <tr>
-<td><nobr><code>-c &lt;test_class_or_method&gt; </code></nobr></td>
-<td><strong>Required</strong>. The {@code &lt;test_class_or_method&gt;} argument is a list of one or more specific test classes or test methods from the JARs that you want {@code uiautomator} to run. <p>Each class or method must be fully qualified with the package name, in one of these formats:
+<td><nobr><code>-c &lt;CLASSES&gt; </code></nobr></td>
+<td><strong>Required (API 17 or lower)</strong>.The {@code &lt;CLASSES&gt;} 
+argument is a list of test classes or test methods in {@code &lt;JARS&gt;} to run. 
+<p>Each class or method must be fully 
+qualified with the package name, in one of these formats:
 <ul>
 <li>{@code package_name.class_name}</li>
 <li>{@code package_name.class_name#method_name}</li>
 </ul>
-You can list multiple classes or methods by using a space as a separator.</p></td>
+You can list multiple classes or methods by using a space as a separator.</p>
+<p class="note"><strong>Note:</strong>This argument is not required for API 18 
+and higher. If not specified, all test cases in {@code &lt;JARS&gt;} will be run.
+</p>
+</td>
 </tr>
 
 <tr>
@@ -76,12 +83,16 @@
 </tr>
 
 <tr>
-<td><code>dump</code></td>
-<td><code>[file]</code></td>
+<td><code>dump [file]</code></td>
 <td>Generate an XML file with a dump of the current UI hierarchy. If a filepath is not specified, by default, the generated dump file is stored on the device in this location {@code /storage/sdcard0/window_dump.xml}.</td>
 </tr>
 
 <tr>
+<td><nobr><code>-e outputFormat simple | -s</code></nobr></td>
+<td>Enables less verbose JUnit style output.</td>
+</tr>
+
+<tr>
 <td><code>events</code></td>
 <td>&nbsp;</td>
 <td>Prints out accessibility events to the console until the connection to the device is terminated</td>
@@ -123,6 +134,11 @@
 <td>Represents a query for one or more target UI elements on a device screen. </td>
 </tr>
 
+<tr>
+<td><nobr><a href="{@docRoot}tools/help/uiautomator/Configurator.html">{@code com.android.uiautomator.core.Configurator}</a></nobr></td>
+<td>Allows you to set key parameters for running uiautomator tests.</td>
+</tr>
+
 </table>
 
 <h3 id="interfaces">Interfaces</h3>
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index 6389880..c555f98 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -187,6 +187,7 @@
        <li class="nav-section">
           <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/uiautomator/index.html"><span class="en">uiautomator</span></a></div>
           <ul>
+             <li><a href="<?cs var:toroot ?>tools/help/uiautomator/Configurator.html"><span class="en">Configurator</span></a></li>
              <li><a href="<?cs var:toroot ?>tools/help/uiautomator/IAutomationSupport.html"><span class="en">IAutomationSupport</span></a></li>
              <li><a href="<?cs var:toroot ?>tools/help/uiautomator/UiAutomatorTestCase.html"><span class="en">UiAutomatorTestCase</span></a></li>
              <li><a href="<?cs var:toroot ?>tools/help/uiautomator/UiCollection.html"><span class="en">UiCollection</span></a></li>
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 8295c5f..93ab401 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -2553,4 +2553,15 @@
         }
     }
 
+    /**
+     * Returns the estimated latency for the given stream type in milliseconds.
+     *
+     * DO NOT UNHIDE. The existing approach for doing A/V sync has too many problems. We need
+     * a better solution.
+     * @hide
+     */
+    public int getOutputLatency(int streamType) {
+        return AudioSystem.getOutputLatency(streamType);
+    }
+
 }
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 4a33743..d42bfd44 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -401,5 +401,6 @@
     // helpers for android.media.AudioManager.getProperty(), see description there for meaning
     public static native int getPrimaryOutputSamplingRate();
     public static native int getPrimaryOutputFrameCount();
+    public static native int getOutputLatency(int stream);
 
 }
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index 399eb7b..9768a78 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -628,6 +628,18 @@
     }
 
     /**
+     * Returns this track's estimated latency in milliseconds. This includes the latency due
+     * to AudioTrack buffer size, AudioMixer (if any) and audio hardware driver.
+     *
+     * DO NOT UNHIDE. The existing approach for doing A/V sync has too many problems. We need
+     * a better solution.
+     * @hide
+     */
+    public int getLatency() {
+        return native_get_latency();
+    }
+
+    /**
      *  Returns the hardware output sample rate
      */
     static public int getNativeOutputSampleRate(int streamType) {
@@ -1256,6 +1268,8 @@
     private native final int native_set_position(int position);
     private native final int native_get_position();
 
+    private native final int native_get_latency();
+
     private native final int native_set_loop(int start, int end, int loopCount);
 
     static private native final int native_get_output_sample_rate(int streamType);
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index 1544910..cb073d2 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -201,7 +201,7 @@
     <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"Kein Netz"</string>
     <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"WLAN aus"</string>
     <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"WLAN-Display"</string>
-    <string name="quick_settings_wifi_display_no_connection_label" msgid="2355298740765736918">"Kabellose Übertragung"</string>
+    <string name="quick_settings_wifi_display_no_connection_label" msgid="2355298740765736918">"Kabellose Übertragung (WiDi)"</string>
     <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Helligkeit"</string>
     <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string>
     <string name="status_bar_help_title" msgid="1199237744086469217">"Benachrichtigungen erscheinen hier"</string>
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 37a8cb8..e7dd3b7 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -31,6 +31,9 @@
 import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
 import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
 
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.bluetooth.BluetoothTetheringDataTracker;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -52,11 +55,13 @@
 import android.net.INetworkStatsService;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
+import android.net.Uri;
 import android.net.LinkProperties.CompareResult;
 import android.net.MobileDataStateTracker;
 import android.net.NetworkConfig;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
+import android.net.NetworkInfo.State;
 import android.net.NetworkQuotaInfo;
 import android.net.NetworkState;
 import android.net.NetworkStateTracker;
@@ -66,6 +71,7 @@
 import android.net.RouteInfo;
 import android.net.wifi.WifiStateTracker;
 import android.net.wimax.WimaxManagerConstants;
+import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.FileUtils;
 import android.os.Handler;
@@ -79,6 +85,7 @@
 import android.os.PowerManager;
 import android.os.Process;
 import android.os.RemoteException;
+import android.os.ResultReceiver;
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
@@ -86,13 +93,16 @@
 import android.provider.Settings;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Slog;
 import android.util.SparseIntArray;
 
+import com.android.internal.R;
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
+import com.android.internal.telephony.DctConstants;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.util.IndentingPrintWriter;
@@ -111,9 +121,11 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Constructor;
+import java.net.HttpURLConnection;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
+import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -121,6 +133,8 @@
 import java.util.GregorianCalendar;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @hide
@@ -141,6 +155,12 @@
     private static final String NETWORK_RESTORE_DELAY_PROP_NAME =
             "android.telephony.apn-restore";
 
+    // Default value if FAIL_FAST_TIME_MS is not set
+    private static final int DEFAULT_FAIL_FAST_TIME_MS = 1 * 60 * 1000;
+    // system property that can override DEFAULT_FAIL_FAST_TIME_MS
+    private static final String FAIL_FAST_TIME_MS =
+            "persist.radio.fail_fast_time_ms";
+
     // used in recursive route setting to add gateways for the host for which
     // a host route was requested.
     private static final int MAX_HOSTROUTE_CYCLE_COUNT = 10;
@@ -292,6 +312,11 @@
 
     private static final int EVENT_VPN_STATE_CHANGED = 14;
 
+    /**
+     * Used internally to disable fail fast of mobile data
+     */
+    private static final int EVENT_ENABLE_FAIL_FAST_MOBILE_DATA = 15;
+
     /** Handler used for internal events. */
     private InternalHandler mHandler;
     /** Handler used for incoming {@link NetworkStateTracker} events. */
@@ -346,6 +371,10 @@
     // the set of network types that can only be enabled by system/sig apps
     List mProtectedNetworks;
 
+    private AtomicInteger mEnableFailFastMobileDataTag = new AtomicInteger(0);
+
+    TelephonyManager mTelephonyManager;
+
     public ConnectivityService(Context context, INetworkManagementService netd,
             INetworkStatsService statsService, INetworkPolicyManager policyManager) {
         // Currently, omitting a NetworkFactory will create one internally
@@ -394,6 +423,7 @@
         mNetd = checkNotNull(netManager, "missing INetworkManagementService");
         mPolicyManager = checkNotNull(policyManager, "missing INetworkPolicyManager");
         mKeyStore = KeyStore.getInstance();
+        mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
 
         try {
             mPolicyManager.registerListener(mPolicyListener);
@@ -1408,8 +1438,12 @@
                 netState != DetailedState.CAPTIVE_PORTAL_CHECK) ||
                 tracker.isTeardownRequested()) {
             if (VDBG) {
-                log("requestRouteToHostAddress on down network " +
-                           "(" + networkType + ") - dropped");
+                log("requestRouteToHostAddress on down network "
+                        + "(" + networkType + ") - dropped"
+                        + " tracker=" + tracker
+                        + " netState=" + netState
+                        + " isTeardownRequested="
+                            + ((tracker != null) ? tracker.isTeardownRequested() : "tracker:null"));
             }
             return false;
         }
@@ -1417,12 +1451,15 @@
         try {
             InetAddress addr = InetAddress.getByAddress(hostAddress);
             LinkProperties lp = tracker.getLinkProperties();
-            return addRouteToAddress(lp, addr);
+            boolean ok = addRouteToAddress(lp, addr);
+            if (DBG) log("requestRouteToHostAddress ok=" + ok);
+            return ok;
         } catch (UnknownHostException e) {
             if (DBG) log("requestRouteToHostAddress got " + e.toString());
         } finally {
             Binder.restoreCallingIdentity(token);
         }
+        if (DBG) log("requestRouteToHostAddress X bottom return false");
         return false;
     }
 
@@ -2824,6 +2861,19 @@
                     }
                     break;
                 }
+                case EVENT_ENABLE_FAIL_FAST_MOBILE_DATA: {
+                    int tag = mEnableFailFastMobileDataTag.get();
+                    if (msg.arg1 == tag) {
+                        MobileDataStateTracker mobileDst =
+                            (MobileDataStateTracker) mNetTrackers[ConnectivityManager.TYPE_MOBILE];
+                        if (mobileDst != null) {
+                            mobileDst.setEnableFailFastMobileData(msg.arg2);
+                        }
+                    } else {
+                        log("EVENT_ENABLE_FAIL_FAST_MOBILE_DATA: stale arg1:" + msg.arg1
+                                + " != tag:" + tag);
+                    }
+                }
             }
         }
     }
@@ -3472,4 +3522,470 @@
         }
         return ConnectivityManager.TYPE_NONE;
     }
+
+    /**
+     * Have mobile data fail fast if enabled.
+     *
+     * @param enabled DctConstants.ENABLED/DISABLED
+     */
+    private void setEnableFailFastMobileData(int enabled) {
+        int tag;
+
+        if (enabled == DctConstants.ENABLED) {
+            tag = mEnableFailFastMobileDataTag.incrementAndGet();
+        } else {
+            tag = mEnableFailFastMobileDataTag.get();
+        }
+        mHandler.sendMessage(mHandler.obtainMessage(EVENT_ENABLE_FAIL_FAST_MOBILE_DATA, tag,
+                         enabled));
+    }
+
+    @Override
+    public int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs,
+            final ResultReceiver resultReceiver) {
+        log("checkMobileProvisioning: E sendNotification=" + sendNotification
+                + " suggestedTimeOutMs=" + suggestedTimeOutMs
+                + " resultReceiver=" + resultReceiver);
+        enforceChangePermission();
+
+        int timeOutMs = suggestedTimeOutMs;
+        if (suggestedTimeOutMs > CheckMp.MAX_TIMEOUT_MS) {
+            timeOutMs = CheckMp.MAX_TIMEOUT_MS;
+        }
+
+        // Check that mobile networks are supported
+        if (!isNetworkSupported(ConnectivityManager.TYPE_MOBILE)
+                || !isNetworkSupported(ConnectivityManager.TYPE_MOBILE_HIPRI)) {
+            log("checkMobileProvisioning: X no mobile network");
+            if (resultReceiver != null) {
+                resultReceiver.send(ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION, null);
+            }
+            return timeOutMs;
+        }
+
+        final long token = Binder.clearCallingIdentity();
+        try {
+            CheckMp checkMp = new CheckMp(mContext, this);
+            CheckMp.CallBack cb = new CheckMp.CallBack() {
+                @Override
+                void onComplete(Integer result) {
+                    log("CheckMp.onComplete: result=" + result);
+                    if (resultReceiver != null) {
+                        log("CheckMp.onComplete: send result");
+                        resultReceiver.send(result, null);
+                    }
+                    NetworkInfo ni =
+                            mNetTrackers[ConnectivityManager.TYPE_MOBILE_HIPRI].getNetworkInfo();
+                    switch(result) {
+                        case ConnectivityManager.CMP_RESULT_CODE_CONNECTABLE:
+                        case ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION: {
+                            log("CheckMp.onComplete: ignore, connected or no connection");
+                            break;
+                        }
+                        case ConnectivityManager.CMP_RESULT_CODE_REDIRECTED: {
+                            log("CheckMp.onComplete: warm sim");
+                            String url = getProvisioningUrl();
+                            if (TextUtils.isEmpty(url)) {
+                                url = mContext.getResources()
+                                        .getString(R.string.mobile_redirected_provisioning_url);
+                            }
+                            if (TextUtils.isEmpty(url) == false) {
+                                log("CheckMp.onComplete: warm sim (redirected), url=" + url);
+                                setNotificationVisible(true, ni, url);
+                            } else {
+                                log("CheckMp.onComplete: warm sim (redirected), no url");
+                            }
+                            break;
+                        }
+                        case ConnectivityManager.CMP_RESULT_CODE_NO_DNS:
+                        case ConnectivityManager.CMP_RESULT_CODE_NO_TCP_CONNECTION: {
+                            String url = getProvisioningUrl();
+                            if (TextUtils.isEmpty(url) == false) {
+                                log("CheckMp.onComplete: warm sim (no dns/tcp), url=" + url);
+                                setNotificationVisible(true, ni, url);
+                            } else {
+                                log("CheckMp.onComplete: warm sim (no dns/tcp), no url");
+                            }
+                            break;
+                        }
+                        default: {
+                            loge("CheckMp.onComplete: ignore unexpected result=" + result);
+                            break;
+                        }
+                    }
+                }
+            };
+            CheckMp.Params params =
+                    new CheckMp.Params(checkMp.getDefaultUrl(), timeOutMs, cb);
+            log("checkMobileProvisioning: params=" + params);
+            setNotificationVisible(false, null, null);
+            checkMp.execute(params);
+        } finally {
+            Binder.restoreCallingIdentity(token);
+            log("checkMobileProvisioning: X");
+        }
+        return timeOutMs;
+    }
+
+    static class CheckMp extends
+            AsyncTask<CheckMp.Params, Void, Integer> {
+        private static final String CHECKMP_TAG = "CheckMp";
+        public static final int MAX_TIMEOUT_MS =  60000;
+        private static final int SOCKET_TIMEOUT_MS = 5000;
+        private Context mContext;
+        private ConnectivityService mCs;
+        private TelephonyManager mTm;
+        private Params mParams;
+
+        /**
+         * Parameters for AsyncTask.execute
+         */
+        static class Params {
+            private String mUrl;
+            private long mTimeOutMs;
+            private CallBack mCb;
+
+            Params(String url, long timeOutMs, CallBack cb) {
+                mUrl = url;
+                mTimeOutMs = timeOutMs;
+                mCb = cb;
+            }
+
+            @Override
+            public String toString() {
+                return "{" + " url=" + mUrl + " mTimeOutMs=" + mTimeOutMs + " mCb=" + mCb + "}";
+            }
+        }
+
+        /**
+         * The call back object passed in Params. onComplete will be called
+         * on the main thread.
+         */
+        abstract static class CallBack {
+            // Called on the main thread.
+            abstract void onComplete(Integer result);
+        }
+
+        public CheckMp(Context context, ConnectivityService cs) {
+            mContext = context;
+            mCs = cs;
+
+            // Setup access to TelephonyService we'll be using.
+            mTm = (TelephonyManager) mContext.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+        }
+
+        /**
+         * Get the default url to use for the test.
+         */
+        public String getDefaultUrl() {
+            // See http://go/clientsdns for usage approval
+            String server = Settings.Global.getString(mContext.getContentResolver(),
+                    Settings.Global.CAPTIVE_PORTAL_SERVER);
+            if (server == null) {
+                server = "clients3.google.com";
+            }
+            return "http://" + server + "/generate_204";
+        }
+
+        /**
+         * Detect if its possible to connect to the http url. DNS based detection techniques
+         * do not work at all hotspots. The best way to check is to perform a request to
+         * a known address that fetches the data we expect.
+         */
+        private synchronized Integer isMobileOk(Params params) {
+            Integer result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION;
+            Uri orgUri = Uri.parse(params.mUrl);
+            Random rand = new Random();
+            mParams = params;
+
+            try {
+                if (mCs.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false) {
+                    log("isMobileOk: not mobile capable");
+                    result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION;
+                    return result;
+                }
+
+                // Enable fail fast as we'll do retries here and use a
+                // hipri connection so the default connection stays active.
+                log("isMobileOk: start hipri url=" + params.mUrl);
+                mCs.setEnableFailFastMobileData(DctConstants.ENABLED);
+                mCs.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
+                        Phone.FEATURE_ENABLE_HIPRI, new Binder());
+
+                // Continue trying to connect until time has run out
+                long endTime = SystemClock.elapsedRealtime() + params.mTimeOutMs;
+                while(SystemClock.elapsedRealtime() < endTime) {
+                    try {
+                        // Wait for hipri to connect.
+                        // TODO: Don't poll and handle situation where hipri fails
+                        // because default is retrying. See b/9569540
+                        NetworkInfo.State state = mCs
+                                .getNetworkInfo(ConnectivityManager.TYPE_MOBILE_HIPRI).getState();
+                        if (state != NetworkInfo.State.CONNECTED) {
+                            log("isMobileOk: not connected ni=" +
+                                    mCs.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_HIPRI));
+                            sleep(1);
+                            result = ConnectivityManager.CMP_RESULT_CODE_NO_CONNECTION;
+                            continue;
+                        }
+
+                        // Get of the addresses associated with the url host. We need to use the
+                        // address otherwise HttpURLConnection object will use the name to get
+                        // the addresses and is will try every address but that will bypass the
+                        // route to host we setup and the connection could succeed as the default
+                        // interface might be connected to the internet via wifi or other interface.
+                        InetAddress[] addresses;
+                        try {
+                            addresses = InetAddress.getAllByName(orgUri.getHost());
+                        } catch (UnknownHostException e) {
+                            log("isMobileOk: UnknownHostException");
+                            result = ConnectivityManager.CMP_RESULT_CODE_NO_DNS;
+                            return result;
+                        }
+                        log("isMobileOk: addresses=" + inetAddressesToString(addresses));
+
+                        // Get the type of addresses supported by this link
+                        LinkProperties lp = mCs.getLinkProperties(
+                                ConnectivityManager.TYPE_MOBILE_HIPRI);
+                        boolean linkHasIpv4 = hasIPv4Address(lp);
+                        boolean linkHasIpv6 = hasIPv6Address(lp);
+                        log("isMobileOk: linkHasIpv4=" + linkHasIpv4
+                                + " linkHasIpv6=" + linkHasIpv6);
+
+                        // Loop through at most 3 valid addresses or all of the address or until
+                        // we run out of time
+                        int loops = Math.min(3, addresses.length);
+                        for(int validAddr=0, addrTried=0;
+                                    (validAddr < loops) && (addrTried < addresses.length)
+                                      && (SystemClock.elapsedRealtime() < endTime);
+                                addrTried ++) {
+
+                            // Choose the address at random but make sure its type is supported
+                            InetAddress hostAddr = addresses[rand.nextInt(addresses.length)];
+                            if (((hostAddr instanceof Inet4Address) && linkHasIpv4)
+                                    || ((hostAddr instanceof Inet6Address) && linkHasIpv6)) {
+                                // Valid address, so use it
+                                validAddr += 1;
+                            } else {
+                                // Invalid address so try next address
+                                continue;
+                            }
+
+                            // Make a route to host so we check the specific interface.
+                            if (mCs.requestRouteToHostAddress(ConnectivityManager.TYPE_MOBILE_HIPRI,
+                                    hostAddr.getAddress())) {
+                                // Wait a short time to be sure the route is established ??
+                                log("isMobileOk:"
+                                        + " wait to establish route to hostAddr=" + hostAddr);
+                                sleep(3);
+                            } else {
+                                log("isMobileOk:"
+                                        + " could not establish route to hostAddr=" + hostAddr);
+                                continue;
+                            }
+
+                            // Rewrite the url to have numeric address to use the specific route.
+                            // I also set the "Connection" to "Close" as by default "Keep-Alive"
+                            // is used which is useless in this case.
+                            URL newUrl = new URL(orgUri.getScheme() + "://"
+                                    + hostAddr.getHostAddress() + orgUri.getPath());
+                            log("isMobileOk: newUrl=" + newUrl);
+
+                            HttpURLConnection urlConn = null;
+                            try {
+                                // Open the connection set the request header and get the response
+                                urlConn = (HttpURLConnection) newUrl.openConnection(
+                                        java.net.Proxy.NO_PROXY);
+                                urlConn.setInstanceFollowRedirects(false);
+                                urlConn.setConnectTimeout(SOCKET_TIMEOUT_MS);
+                                urlConn.setReadTimeout(SOCKET_TIMEOUT_MS);
+                                urlConn.setUseCaches(false);
+                                urlConn.setAllowUserInteraction(false);
+                                urlConn.setRequestProperty("Connection", "close");
+                                int responseCode = urlConn.getResponseCode();
+                                if (responseCode == 204) {
+                                    result = ConnectivityManager.CMP_RESULT_CODE_CONNECTABLE;
+                                } else {
+                                    result = ConnectivityManager.CMP_RESULT_CODE_REDIRECTED;
+                                }
+                                log("isMobileOk: connected responseCode=" + responseCode);
+                                urlConn.disconnect();
+                                urlConn = null;
+                                return result;
+                            } catch (Exception e) {
+                                log("isMobileOk: HttpURLConnection Exception e=" + e);
+                                if (urlConn != null) {
+                                    urlConn.disconnect();
+                                    urlConn = null;
+                                }
+                            }
+                        }
+                        result = ConnectivityManager.CMP_RESULT_CODE_NO_TCP_CONNECTION;
+                        log("isMobileOk: loops|timed out");
+                        return result;
+                    } catch (Exception e) {
+                        log("isMobileOk: Exception e=" + e);
+                        continue;
+                    }
+                }
+                log("isMobileOk: timed out");
+            } finally {
+                log("isMobileOk: F stop hipri");
+                mCs.setEnableFailFastMobileData(DctConstants.DISABLED);
+                mCs.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
+                        Phone.FEATURE_ENABLE_HIPRI);
+                log("isMobileOk: X result=" + result);
+            }
+            return result;
+        }
+
+        @Override
+        protected Integer doInBackground(Params... params) {
+            return isMobileOk(params[0]);
+        }
+
+        @Override
+        protected void onPostExecute(Integer result) {
+            log("onPostExecute: result=" + result);
+            if ((mParams != null) && (mParams.mCb != null)) {
+                mParams.mCb.onComplete(result);
+            }
+        }
+
+        private String inetAddressesToString(InetAddress[] addresses) {
+            StringBuffer sb = new StringBuffer();
+            boolean firstTime = true;
+            for(InetAddress addr : addresses) {
+                if (firstTime) {
+                    firstTime = false;
+                } else {
+                    sb.append(",");
+                }
+                sb.append(addr);
+            }
+            return sb.toString();
+        }
+
+        private void printNetworkInfo() {
+            boolean hasIccCard = mTm.hasIccCard();
+            int simState = mTm.getSimState();
+            log("hasIccCard=" + hasIccCard
+                    + " simState=" + simState);
+            NetworkInfo[] ni = mCs.getAllNetworkInfo();
+            if (ni != null) {
+                log("ni.length=" + ni.length);
+                for (NetworkInfo netInfo: ni) {
+                    log("netInfo=" + netInfo.toString());
+                }
+            } else {
+                log("no network info ni=null");
+            }
+        }
+
+        /**
+         * Sleep for a few seconds then return.
+         * @param seconds
+         */
+        private static void sleep(int seconds) {
+            try {
+                Thread.sleep(seconds * 1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        public boolean hasIPv4Address(LinkProperties lp) {
+            return lp.hasIPv4Address();
+        }
+
+        // Not implemented in LinkProperties, do it here.
+        public boolean hasIPv6Address(LinkProperties lp) {
+            for (LinkAddress address : lp.getLinkAddresses()) {
+              if (address.getAddress() instanceof Inet6Address) {
+                return true;
+              }
+            }
+            return false;
+        }
+
+        private void log(String s) {
+            Slog.d(ConnectivityService.TAG, "[" + CHECKMP_TAG + "] " + s);
+        }
+    }
+
+    private static final String NOTIFICATION_ID = "CaptivePortal.Notification";
+
+    private void setNotificationVisible(boolean visible, NetworkInfo networkInfo, String url) {
+        log("setNotificationVisible: E visible=" + visible + " ni=" + networkInfo + " url=" + url);
+
+        Resources r = Resources.getSystem();
+        NotificationManager notificationManager = (NotificationManager) mContext
+            .getSystemService(Context.NOTIFICATION_SERVICE);
+
+        if (visible) {
+            CharSequence title;
+            CharSequence details;
+            int icon;
+            switch (networkInfo.getType()) {
+                case ConnectivityManager.TYPE_WIFI:
+                    log("setNotificationVisible: TYPE_WIFI");
+                    title = r.getString(R.string.wifi_available_sign_in, 0);
+                    details = r.getString(R.string.network_available_sign_in_detailed,
+                            networkInfo.getExtraInfo());
+                    icon = R.drawable.stat_notify_wifi_in_range;
+                    break;
+                case ConnectivityManager.TYPE_MOBILE:
+                case ConnectivityManager.TYPE_MOBILE_HIPRI:
+                    log("setNotificationVisible: TYPE_MOBILE|HIPRI");
+                    title = r.getString(R.string.network_available_sign_in, 0);
+                    // TODO: Change this to pull from NetworkInfo once a printable
+                    // name has been added to it
+                    details = mTelephonyManager.getNetworkOperatorName();
+                    icon = R.drawable.stat_notify_rssi_in_range;
+                    break;
+                default:
+                    log("setNotificationVisible: other type=" + networkInfo.getType());
+                    title = r.getString(R.string.network_available_sign_in, 0);
+                    details = r.getString(R.string.network_available_sign_in_detailed,
+                            networkInfo.getExtraInfo());
+                    icon = R.drawable.stat_notify_rssi_in_range;
+                    break;
+            }
+
+            Notification notification = new Notification();
+            notification.when = 0;
+            notification.icon = icon;
+            notification.flags = Notification.FLAG_AUTO_CANCEL;
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT |
+                    Intent.FLAG_ACTIVITY_NEW_TASK);
+            notification.contentIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+            notification.tickerText = title;
+            notification.setLatestEventInfo(mContext, title, details, notification.contentIntent);
+
+            log("setNotificaitionVisible: notify notificaiton=" + notification);
+            notificationManager.notify(NOTIFICATION_ID, 1, notification);
+        } else {
+            log("setNotificaitionVisible: cancel");
+            notificationManager.cancel(NOTIFICATION_ID, 1);
+        }
+        log("setNotificationVisible: X visible=" + visible + " ni=" + networkInfo + " url=" + url);
+    }
+
+    private String getProvisioningUrl() {
+        String url = mContext.getResources().getString(R.string.mobile_provisioning_url);
+        log("getProvisioningUrl: resource url=" + url);
+
+        // populate the iccid and imei in the provisioning url.
+        if (!TextUtils.isEmpty(url)) {
+            url = String.format(url,
+                    mTelephonyManager.getSimSerialNumber() /* ICCID */,
+                    mTelephonyManager.getDeviceId() /* IMEI */,
+                    mTelephonyManager.getLine1Number() /* Phone numer */);
+        }
+
+        log("getProvisioningUrl: url=" + url);
+        return url;
+    }
 }
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java
index 9d556c0..4d8342c 100644
--- a/telephony/java/com/android/internal/telephony/DctConstants.java
+++ b/telephony/java/com/android/internal/telephony/DctConstants.java
@@ -93,6 +93,7 @@
     public static final int EVENT_ICC_CHANGED = BASE + 33;
     public static final int EVENT_DISCONNECT_DC_RETRYING = BASE + 34;
     public static final int EVENT_DATA_SETUP_COMPLETE_ERROR = BASE + 35;
+    public static final int CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA = BASE + 36;
 
     /***** Constants *****/