aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-06-18 15:13:35 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-18 15:13:35 -0700
commite3d76583977238be4f83e934c8ace4375a5bbd5c (patch)
tree837adf9e4fd307faed76b7b7384c873f4c0cceef
parent45a000b053c8b299707d27d0dc83f8711729d65a (diff)
parentca025e61835851d17a1c0a635646b4b8eabf4f37 (diff)
downloadsdk-e3d76583977238be4f83e934c8ace4375a5bbd5c.zip
sdk-e3d76583977238be4f83e934c8ace4375a5bbd5c.tar.gz
sdk-e3d76583977238be4f83e934c8ace4375a5bbd5c.tar.bz2
Merge "Fix instructions from SDK Controller app"
-rwxr-xr-xapps/SdkController/assets/intro_help.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/SdkController/assets/intro_help.html b/apps/SdkController/assets/intro_help.html
index c957f73..7657aa3 100755
--- a/apps/SdkController/assets/intro_help.html
+++ b/apps/SdkController/assets/intro_help.html
@@ -32,8 +32,10 @@ To use it, do the following: <br/>
<ol>
<li>Connect your device to your computer via USB. Make sure to enable <i>USB Debugging</i> in <i>Settings &gt; Developer Options</i>. </li>
<li>Start this application on your device. </li>
-<li>On the computer in a shell, run: <br/><i>adb forward tcp:1970 localhost:android.sdk.controller</i> </li>
-<li>Finally <b>run an emulator</b> with an AVD targetting <b>API 15</b>. </li>
+<li>On the computer in a shell, run: <br/><i>adb forward tcp:1970 localabstract:android.sdk.controller</i> </li>
+<li>Finally <b>run an emulator</b> with an AVD targetting <b>API 15</b>.
+Multi-touch emulation must be explicitly enabled in emulator either by setting "Touch screen type" property to "multi-touch" in AVD Manager,
+or by starting the emulator with "-screen multi-touch" option.</li>
</ol>
<a href="https://sites.google.com/a/android.com/tools/recent/sensoremulation">Read more.</a>
</body>