diff options
| -rw-r--r-- | docs/html/guide/developing/device.jd | 5 | ||||
| -rw-r--r-- | docs/html/guide/publishing/app-signing.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/menu-resource.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/wireless/bluetooth.jd | 4 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/hello-world.jd | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index abfae5d849e0..3127e10f3f5f 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -119,7 +119,7 @@ USB device support on Linux. The USB Vendor ID is the value given to the <table> <tr> - <th>Manufacturer</th><th>USB Vendor ID</th></tr> + <th>Company</th><th>USB Vendor ID</th></tr> <tr> <td>Acer</td> <td><code>0502</code></td></tr> @@ -133,6 +133,9 @@ USB device support on Linux. The USB Vendor ID is the value given to the <td>Garmin-Asus</td> <td><code>091E</code></td></tr> <tr> + <td>Google</td> + <td><code>18d1</code></td></tr> + <tr> <td>HTC</td> <td><code>0bb4</code></td></tr> <tr> diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd index 93077a0aad7f..df240e202c6b 100644 --- a/docs/html/guide/publishing/app-signing.jd +++ b/docs/html/guide/publishing/app-signing.jd @@ -260,8 +260,8 @@ looks like this:</p> <p>To fix this problem, simply delete the <code>debug.keystore</code> file. The default storage location for AVDs is in <code>~/.android/</code> on OS X and Linux, -in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in -<code>C:\Users\<user>\.android\</code> on Windows Vista.</p> +in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in +<code>C:\Users\<user>\.android\</code> on Windows Vista and Windows 7.</p> <p>The next time you build, the build tools will regenerate a new keystore and debug key.</p> diff --git a/docs/html/guide/topics/resources/menu-resource.jd b/docs/html/guide/topics/resources/menu-resource.jd index d09790bc14e8..5c1eed03fb0a 100644 --- a/docs/html/guide/topics/resources/menu-resource.jd +++ b/docs/html/guide/topics/resources/menu-resource.jd @@ -250,7 +250,7 @@ on the data that is currently displayed.</td></tr> android:icon="@drawable/group_item1_icon" /> <item android:id="@+id/group_item2" android:onClick="onGroupItemClick" - android:title="G@string/group_item2" + android:title="@string/group_item2" android:icon="@drawable/group_item2_icon" /> </group> <item android:id="@+id/submenu" diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index b3c768715776..ae078b9da81e 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -554,7 +554,7 @@ private class AcceptThread extends Thread { BluetoothServerSocket tmp = null; try { // MY_UUID is the app's UUID string, also used by the client code - tmp = mAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID); + tmp = mBluetoothAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID); } catch (IOException e) { } mmServerSocket = tmp; } @@ -690,7 +690,7 @@ private class ConnectThread extends Thread { public void run() { // Cancel discovery because it will slow down the connection - mAdapter.cancelDiscovery(); + mBluetoothAdapter.cancelDiscovery(); try { // Connect the device through the socket. This will block diff --git a/docs/html/resources/tutorials/hello-world.jd b/docs/html/resources/tutorials/hello-world.jd index 020c7383ea6e..b11770ffff87 100644 --- a/docs/html/resources/tutorials/hello-world.jd +++ b/docs/html/resources/tutorials/hello-world.jd @@ -433,7 +433,7 @@ The entire file should now look like this: </pre> </li> -<li>Now open and modify your <code>HelloAndroid</code> class use the +<li>Now open and modify your <code>HelloAndroid</code> class and use the XML layout. Edit the file to look like this: <pre> package com.example.helloandroid; |