diff options
Diffstat (limited to 'docs/html/tools')
| -rw-r--r-- | docs/html/tools/help/adb.jd | 98 | ||||
| -rw-r--r-- | docs/html/tools/help/proguard.jd | 31 | ||||
| -rw-r--r-- | docs/html/tools/revisions/platforms.jd | 21 | ||||
| -rw-r--r-- | docs/html/tools/samples/index.jd | 32 | ||||
| -rw-r--r-- | docs/html/tools/tools_toc.cs | 6 |
5 files changed, 133 insertions, 55 deletions
diff --git a/docs/html/tools/help/adb.jd b/docs/html/tools/help/adb.jd index c25990f..c339943 100644 --- a/docs/html/tools/help/adb.jd +++ b/docs/html/tools/help/adb.jd @@ -27,6 +27,7 @@ page.tags="adb" </li> <li><a href="#logcat">Enabling logcat logging</a></li> <li><a href="#stopping">Stopping the adb server</a></li> + <li><a href="#wireless">Wireless usage</a></li> </ol> </div> @@ -1342,3 +1343,100 @@ application and sends 500 pseudo-random events to it.</p> You can then restart the server by issuing any other adb command. </p> +<h2 id="wireless">Wireless usage</h2> + +<p> +adb is usually used over USB. However, it is also possible to use over +Wi-Fi, as described here. +</p> + +<ol> + +<li> +Connect Android device and adb host computer +to a common Wi-Fi network accessible to both. +We have found that not all access points +are suitable; you may need to use an access point +whose firewall is configured properly to support adb. +</li> + +<li> +Connect the device with USB cable to host. +</li> + +<li> +Make sure adb is running in USB mode on host. +<pre> +$ adb usb +restarting in USB mode +</pre> +</li> + +<li> +Connect to the device over USB. +<pre> +$ adb devices +List of devices attached +######## device +</pre> +</li> + +<li> +Restart host adb in tcpip mode. +<pre> +$ adb tcpip 5555 +restarting in TCP mode port: 5555 +</pre> +</li> + +<li> +Find out the IP address of the Android device: +Settings -> About tablet -> Status -> IP address. +Remember the IP address, of the form <code>#.#.#.#</code>. +</li> + +<li> +Connect adb host to device: +<pre> +$ adb connect #.#.#.# +connected to #.#.#.#:5555 +</pre> +</li> + +<li> +Remove USB cable from device, and confirm you can still access device: +<pre> +$ adb devices +List of devices attached +#.#.#.#:5555 device +</pre> + +</ol> + +<p> +You're now good to go! +</p> + +<p> +If the adb connection is ever lost: +</p> + +<ol> + +<li> +Make sure that your host is still connected to the same Wi-Fi network your Android device is. +</li> + +<li> +Reconnect by executing the "adb connect" step again. +</li> + +<li> +Or if that doesn't work, reset your adb host: +<pre> +adb kill-server +</pre> +and then start over from the beginning. +</li> + +</ol> diff --git a/docs/html/tools/help/proguard.jd b/docs/html/tools/help/proguard.jd index 3ba7db2..aa9a0bc 100644 --- a/docs/html/tools/help/proguard.jd +++ b/docs/html/tools/help/proguard.jd @@ -25,11 +25,14 @@ parent.link=index.html <h2>See also</h2> <ol> - <li><a href="http://proguard.sourceforge.net/manual/introduction.html">ProGuard - Manual »</a></li> - - <li><a href="http://proguard.sourceforge.net/manual/retrace/introduction.html">ProGuard - ReTrace Manual »</a></li> + <li> + <a href="http://stuff.mit.edu/afs/sipb/project/android/sdk/android-sdk-linux/tools/proguard/docs/index.html#manual/introduction.html">ProGuard + Manual »</a> + </li> + <li> + <a href="http://stuff.mit.edu/afs/sipb/project/android/sdk/android-sdk-linux/tools/proguard/docs/index.html#manual/retrace/introduction.html">ProGuard + ReTrace Manual »</a> + </li> </ol> </div> </div> @@ -146,14 +149,14 @@ proguard.config=/path/to/proguard.cfg </pre> <p>There are many options and considerations when using the <code>-keep</code> option, so it is - highly recommended that you read the <a href="http://proguard.sourceforge.net/manual/introduction.html">ProGuard - Manual</a> for more information about customizing your configuration file. The <a href= - "http://proguard.sourceforge.net/manual/usage.html#keepoverview">Overview of Keep options</a> and - <a href="http://proguard.sourceforge.net/index.html#/manual/examples.html">Examples section</a> - are particularly helpful. The <a href= - "http://proguard.sourceforge.net/manual/troubleshooting.html">Troubleshooting</a> section of the - ProGuard Manual outlines other common problems you might encounter when your code gets stripped - away.</p> + highly recommended that you read the + <a href="http://stuff.mit.edu/afs/sipb/project/android/sdk/android-sdk-linux/tools/proguard/docs/index.html#manual/introduction.html">ProGuard + Manual</a> for more information about customizing your configuration file. The + <em>Overview of Keep options</em> and <em>Examples</em> sections are particularly helpful. + The <a href= + "http://stuff.mit.edu/afs/sipb/project/android/sdk/android-sdk-linux/tools/proguard/docs/index.html#manual/troubleshooting.html">Troubleshooting + </a> section of the ProGuard Manual outlines other common problems you might encounter + when your code gets stripped away.</p> <h2 id="decoding">Decoding Obfuscated Stack Traces</h2> @@ -192,4 +195,4 @@ proguard.config=/path/to/proguard.cfg <p>How you save the <code>mapping.txt</code> file is your decision. For example, you can rename them to include a version or build number, or you can version control them along with your source - code.</p>
\ No newline at end of file + code.</p> diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd index c5d1ef6..99a271f 100644 --- a/docs/html/tools/revisions/platforms.jd +++ b/docs/html/tools/revisions/platforms.jd @@ -87,18 +87,19 @@ class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2013)</em> </div> + <h3 id="gsi-4.4">Google APIs System Image</h3> <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" -class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2013)</em> +class="toggle-content-img" alt="" />Revision 3</a> <em>(February 2014)</em> </p> <div class="toggle-content-toggleme"> - <p>Maintenance release. This release includes - <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.33, + <p>This release includes + <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.2.42, allowing you to test your application in an emulator using the latest Google Play services.</p> </div> @@ -107,6 +108,20 @@ class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2013)</em> <div class="toggle-content closed"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-closed.png" +class="toggle-content-img" alt="" />Revision 2</a> <em>(December 2013)</em> + </p> + + <div class="toggle-content-toggleme"> + + <p>This release includes + <a href="{@docRoot}google/play-services/index.html">Google Play services</a> version 4.0.33.</p> + + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt="" />Revision 1</a> <em>(October 2013)</em> </p> diff --git a/docs/html/tools/samples/index.jd b/docs/html/tools/samples/index.jd deleted file mode 100644 index 76ba37a..0000000 --- a/docs/html/tools/samples/index.jd +++ /dev/null @@ -1,32 +0,0 @@ -page.title=Samples -page.tags="example","code" -@jd:body - -<p>To help you understand some fundamental Android APIs and coding practices, a variety of sample -code is available from the Android SDK Manager. Each version of the Android platform available -from the SDK Manager offers its own set of sample apps.</p> - -<p>To download the samples:</p> -<ol> - <li>Launch the Android SDK Manager. - <ul> - <li>On Windows, double-click the SDK Manager.exe file at the root of the Android SDK -directory.</li> - <li>On Mac or Linux, open a terminal to the {@code tools/} directory in the -Android SDK, then execute {@code android sdk}.</ul> - </li> - <li>Expand the list of packages for the latest Android platform.</li> - <li>Select and download <em>Samples for SDK</em>.</li> -</ol> - -<p>When the download is complete, you can find the source code for all samples at this location:</p> - -<p style="margin-left:2em"> -<code><sdk>/samples/android-<version>/</code> -</p> - -<p>The {@code <version>} number corresponds to the platform's - <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API level</a>.</p> - -<p>You can easily create new Android projects with the downloaded samples, modify them -if you'd like, and then run them on an emulator or device.</p>
\ No newline at end of file diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs index 3e6b6d4..a8424e6 100644 --- a/docs/html/tools/tools_toc.cs +++ b/docs/html/tools/tools_toc.cs @@ -240,12 +240,6 @@ class="en">Platforms</span></a></li> <li class="nav-section"> - <div class="nav-section-header empty"><a href="<?cs var:toroot -?>tools/samples/index.html"><span class="en">Samples</span></a></div> - </li> - - - <li class="nav-section"> <div class="nav-section-header"> <a href="<?cs var:toroot ?>tools/adk/index.html"> <span class="en">ADK</span></a> |