diff options
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/developing/devices/emulator.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/developing/tools/emulator.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/fundamentals/activities.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/fundamentals/fragments.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/wireless/bluetooth.jd | 32 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/notepad/notepad-ex2.jd | 2 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/views/hello-formstuff.jd | 164 | ||||
| -rw-r--r-- | docs/html/resources/tutorials/views/hello-mapview.jd | 2 |
8 files changed, 109 insertions, 99 deletions
diff --git a/docs/html/guide/developing/devices/emulator.jd b/docs/html/guide/developing/devices/emulator.jd index 02dcb68..c217790 100644 --- a/docs/html/guide/developing/devices/emulator.jd +++ b/docs/html/guide/developing/devices/emulator.jd @@ -78,7 +78,7 @@ preinstalled applications (such as the dialer) that you can access from your applications. You can choose what version of the Android system you want to run in the emulator by configuring AVDs, and you can also customize the mobile device skin and key mappings. When launching the emulator and at runtime, -you can use a variety of commands and options to control the its behaviors. +you can use a variety of commands and options to control its behavior. </p> <p>The Android system image distributed in the SDK contains ARM machine code for diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index 5151ec1..09e41c3 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -516,7 +516,7 @@ the keys of your keyboard. </p> </tr> <tr> <td>Audio volume up button</td> - <td>KEYPAD_PLUS, Ctrl-5</td> + <td>KEYPAD_PLUS, Ctrl-F5</td> </tr> <tr> diff --git a/docs/html/guide/topics/fundamentals/activities.jd b/docs/html/guide/topics/fundamentals/activities.jd index 8736aa8..b79136c 100644 --- a/docs/html/guide/topics/fundamentals/activities.jd +++ b/docs/html/guide/topics/fundamentals/activities.jd @@ -62,7 +62,7 @@ is presented to the user when launching the application for the first time. Each activity can then start another activity in order to perform different actions. Each time a new activity starts, the previous activity is stopped, but the system preserves the activity in a stack (the "back stack"). When a new activity starts, it is pushed onto the back stack and -takes user focus. The back stack abides to the basic "last in, first out" queue mechanism, +takes user focus. The back stack abides to the basic "last in, first out" stack mechanism, so, when the user is done with the current activity and presses the <em>Back</em> button, it is popped from the stack (and destroyed) and the previous activity resumes. (The back stack is discussed more in the <a href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks diff --git a/docs/html/guide/topics/fundamentals/fragments.jd b/docs/html/guide/topics/fundamentals/fragments.jd index d4f9342..e0740aa 100644 --- a/docs/html/guide/topics/fundamentals/fragments.jd +++ b/docs/html/guide/topics/fundamentals/fragments.jd @@ -129,7 +129,7 @@ handset design.</p> <p>For example—to continue with the news application example—the application can embed two fragments in <em>Activity A</em>, when running on a tablet-sized device. However, on a -handset-sized screen, there's not be enough room for both fragments, so <em>Activity A</em> includes +handset-sized screen, there's not enough room for both fragments, so <em>Activity A</em> includes only the fragment for the list of articles, and when the user selects an article, it starts <em>Activity B</em>, which includes the second fragment to read the article. Thus, the application supports both tablets and handsets by reusing fragments in different combinations, as illustrated in diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index 76da08e..0567799 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -249,12 +249,20 @@ if (!mBluetoothAdapter.isEnabled()) { <p>A dialog will appear requesting user permission to enable Bluetooth, as shown in Figure 1. If the user responds "Yes," the system will begin to enable Bluetooth and focus will return to your application once the process completes (or fails).</p> -<p>If enabling Bluetooth succeeds, your Activity will receive the {@link + +<p>The {@code REQUEST_ENABLE_BT} constant passed to {@link +android.app.Activity#startActivityForResult(Intent,int) startActivityForResult()} is a locally +defined integer (which must be greater than 0), that the system passes back to you in your +{@link +android.app.Activity#onActivityResult(int,int,Intent) onActivityResult()} implementation as the +<code>requestCode</code> parameter.</p> + +<p>If enabling Bluetooth succeeds, your activity receives the {@link android.app.Activity#RESULT_OK} result code in the {@link android.app.Activity#onActivityResult(int,int,Intent) onActivityResult()} callback. If Bluetooth was not enabled -due to an error (or the user responded "No") then the result code will be {@link -android.app.Activity#RESULT_CANCELED}.</p> +due to an error (or the user responded "No") then the result code is {@link +android.app.Activity#RESULT_CANCELED}.</p> </li> </ol> @@ -431,11 +439,11 @@ startActivity(discoverableIntent); <p>A dialog will be displayed, requesting user permission to make the device discoverable, as shown in Figure 2. If the user responds "Yes," then the device -will become discoverable for the specified amount of time. Your Activity will +will become discoverable for the specified amount of time. Your activity will then receive a call to the {@link android.app.Activity#onActivityResult(int,int,Intent) onActivityResult())} callback, with the result code equal to the duration that the device is discoverable. If the user responded "No" or if an error occurred, the result code will -be Activity.RESULT_CANCELLED.</p> +be {@link android.app.Activity#RESULT_CANCELED}.</p> <p class="note"><strong>Note:</strong> If Bluetooth has not been enabled on the device, then enabling device discoverability will automatically enable Bluetooth.</p> @@ -568,7 +576,7 @@ socket.</p> </ol> <p>The {@link android.bluetooth.BluetoothServerSocket#accept()} call should not -be executed in the main Activity UI thread because it is a blocking call and +be executed in the main activity UI thread because it is a blocking call and will prevent any other interaction with the application. It usually makes sense to do all work with a {@link android.bluetooth.BluetoothServerSocket} or {@link android.bluetooth.BluetoothSocket} in a new @@ -696,7 +704,7 @@ android.bluetooth.BluetoothSocket#connect()} method times out (after about 12 seconds), then it will throw an exception.</p> <p>Because {@link android.bluetooth.BluetoothSocket#connect()} is a blocking call, this connection -procedure should always be performed in a thread separate from the main Activity +procedure should always be performed in a thread separate from the main activity thread.</p> <p class="note">Note: You should always ensure that the device is not performing device discovery when you call {@link @@ -838,7 +846,7 @@ private class ConnectedThread extends Thread { try { // Read from the InputStream bytes = mmInStream.read(buffer); - // Send the obtained bytes to the UI Activity + // Send the obtained bytes to the UI activity mHandler.obtainMessage(MESSAGE_READ, bytes, -1, buffer) .sendToTarget(); } catch (IOException e) { @@ -847,14 +855,14 @@ private class ConnectedThread extends Thread { } } - /* Call this from the main Activity to send data to the remote device */ + /* Call this from the main activity to send data to the remote device */ public void write(byte[] bytes) { try { mmOutStream.write(bytes); } catch (IOException e) { } } - /* Call this from the main Activity to shutdown the connection */ + /* Call this from the main activity to shutdown the connection */ public void cancel() { try { mmSocket.close(); @@ -866,12 +874,12 @@ private class ConnectedThread extends Thread { <p>The constructor acquires the necessary streams and once executed, the thread will wait for data to come through the InputStream. When {@link java.io.InputStream#read(byte[])} returns with -bytes from the stream, the data is sent to the main Activity using a member +bytes from the stream, the data is sent to the main activity using a member Handler from the parent class. Then it goes back and waits for more bytes from the stream.</p> <p>Sending outgoing data is as simple as calling the thread's -<code>write()</code> method from the main Activity and passing in the bytes to +<code>write()</code> method from the main activity and passing in the bytes to be sent. This method then simply calls {@link java.io.OutputStream#write(byte[])} to send the data to the remote device.</p> diff --git a/docs/html/resources/tutorials/notepad/notepad-ex2.jd b/docs/html/resources/tutorials/notepad/notepad-ex2.jd index ed06778..1334d7a 100644 --- a/docs/html/resources/tutorials/notepad/notepad-ex2.jd +++ b/docs/html/resources/tutorials/notepad/notepad-ex2.jd @@ -87,7 +87,7 @@ Open the Notepadv2 class.</p> menu callback used for the options menu. Here, we add just one line, which will add a menu item to delete a note. Call <code>menu.add()</code> like so: <pre> -public void onCreateContextMenu(Menu menu, View v, ContextMenuInfo menuInfo) { +public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { super.onCreateContextMenu(menu, v, menuInfo); menu.add(0, DELETE_ID, 0, R.string.menu_delete); }</pre> diff --git a/docs/html/resources/tutorials/views/hello-formstuff.jd b/docs/html/resources/tutorials/views/hello-formstuff.jd index b9f6c16..1ddd1df 100644 --- a/docs/html/resources/tutorials/views/hello-formstuff.jd +++ b/docs/html/resources/tutorials/views/hello-formstuff.jd @@ -91,31 +91,30 @@ android.widget.Button} element: android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="10dp" - android:background="@drawable/android_button" /> + android:background="@drawable/android_button" + android:onClick="onButtonClicked"/> </pre> <p>The <code>android:background</code> attribute specifies the drawable resource to use for the button background (which, when saved at <code>res/drawable/android.xml</code>, is referenced as <code>@drawable/android</code>). This replaces the normal background image -used for buttons throughout the system. In order for the drawable to change its image based on -the button state, the image must be applied to the background.</p> +applied by the system with the drawable created above, which changes its image based on +the button state.</p> + <p>The attribute <code>android:onClick</code> specifies the name of a method in your activity +that the system should call when the user clicks the button. You'll create that method next.</p> </li> <li>To make the button do something when pressed, add the following -code at the end of the {@link android.app.Activity#onCreate(Bundle) onCreate()} method: +method inside your {@link android.app.Activity} class: <pre> -final Button button = (Button) findViewById(R.id.button); -button.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - // Perform action on clicks - Toast.makeText(HelloFormStuff.this, "Beep Bop", Toast.LENGTH_SHORT).show(); - } -}); +public void onButtonClicked(View v) { + // Do something when the button is clicked + Toast.makeText(HelloFormStuff.this, "Button clicked", Toast.LENGTH_SHORT).show(); +} </pre> -<p>This captures the {@link android.widget.Button} from the layout, then adds an {@link -android.view.View.OnClickListener}. The {@link android.view.View.OnClickListener} -must implement the {@link android.view.View.OnClickListener#onClick(View)} callback method, which -defines the action to be made when the button is clicked. In this example, a -{@link android.widget.Toast} message will be displayed.</p> +<p>When you specify this kind of method, which is used in your layout file with the {@code +android:onClick} attribute, the method must be <code>public</code>, have a <code>void</code> return +value, and accept a single {@code android.view.View} parameter. When the system calls this method, +it passes the {@code android.view.View} that was clicked.</p> </li> <li>Now run the application.</li> </ol> @@ -183,34 +182,33 @@ element (inside the {@link android.widget.LinearLayout}): <CheckBox android:id="@+id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="check it out" /> + android:text="check it out" + android:onClick="onCheckboxClicked"/> </pre> + <p>The attribute <code>android:onClick</code> specifies the name of a method in your activity +that the system should call when the user clicks the check box. You'll create that method next.</p> </li> -<li>To do something when the state is changed, add the following code -to the end of the {@link android.app.Activity#onCreate(Bundle) onCreate()} method: +<li>To do something when the state is changed, add the following method inside your {@link +android.app.Activity} class:</p> + <pre> -final CheckBox checkbox = (CheckBox) findViewById(R.id.checkbox); -checkbox.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - // Perform action on clicks, depending on whether it's now checked - if (((CheckBox) v).isChecked()) { - Toast.makeText(HelloFormStuff.this, "Selected", Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(HelloFormStuff.this, "Not selected", Toast.LENGTH_SHORT).show(); - } +public void onCheckboxClicked(View v) { + // Perform action on clicks, depending on whether it's now checked + if (((CheckBox) v).isChecked()) { + Toast.makeText(HelloFormStuff.this, "Selected", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(HelloFormStuff.this, "Not selected", Toast.LENGTH_SHORT).show(); } -}); +} </pre> -<p>This captures the {@link android.widget.CheckBox} element from the layout, then adds an {@link -android.view.View.OnClickListener}. The {@link android.view.View.OnClickListener} must implement the -{@link android.view.View.OnClickListener#onClick(View)} callback method, which -defines the action to be made when the checkbox is clicked. When clicked, {@link -android.widget.CompoundButton#isChecked()} is called to check the new state of the check box. If it -has been checked, then a {@link android.widget.Toast} displays the message "Selected", otherwise it -displays "Not selected". Note that the {@link android.view.View} object that is passed in the {@link -android.view.View.OnClickListener#onClick(View)} callback must be cast to a {@link -android.widget.CheckBox} because the {@link android.widget.CompoundButton#isChecked()} method is -not defined by the parent {@link android.view.View} class. The {@link android.widget.CheckBox} + +<p>When you specify this kind of method, which is used in your layout file with the {@code +android:onClick} +attribute, the method must be <code>public</code>, have a <code>void</code> return value, and +accept a single {@code android.view.View} parameter. When the system calls this method, it +passes the {@code android.view.View} that was clicked. In this example, the {@code +android.view.View} is cast to a {@link android.widget.CheckBox} to determine whether the widget +has been checked or unchecked. The {@link android.widget.CheckBox} widget handles its own state changes, so you only need to query the current state.</p> </li> <li>Run it.</li> @@ -240,44 +238,44 @@ android.widget.LinearLayout}): <RadioButton android:id="@+id/radio_red" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Red" /> + android:text="Red" + android:onClick="onRadioButtonClicked"/> <RadioButton android:id="@+id/radio_blue" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Blue" /> + android:text="Blue" + android:onClick="onRadioButtonClicked"/> </RadioGroup> </pre> <p>It's important that the {@link android.widget.RadioButton}s are grouped together by the {@link android.widget.RadioGroup} element so that no more than one can be selected at a time. This logic is automatically handled by the Android system. When one {@link android.widget.RadioButton} within a group is selected, all others are automatically deselected.</p> + <p>The attribute <code>android:onClick</code> specifies the name of a method in your activity +that the system should call when the user clicks the radio button. You'll create that method +next.</p> </li> -<li>To do something when each {@link android.widget.RadioButton} is selected, you need an -{@link android.view.View.OnClickListener}. In this case, you want the listener to be re-usable, so -add the following code to create a new member in the <code>HelloFormStuff</code> Activity: -<pre> -private OnClickListener radio_listener = new OnClickListener() { - public void onClick(View v) { - // Perform action on clicks - RadioButton rb = (RadioButton) v; - Toast.makeText(HelloFormStuff.this, rb.getText(), Toast.LENGTH_SHORT).show(); - } -}; -</pre> -<p>First, the {@link android.view.View} that is passed to the {@link -android.view.View.OnClickListener#onClick(View)} method is cast into a RadioButton. Then a -{@link android.widget.Toast} message displays the selected radio button's text.</p> -<li>Now, at the bottom of the {@link android.app.Activity#onCreate(Bundle) onCreate()} method, add -the following: +<li>To do something when each {@link android.widget.RadioButton} is selected, add the following +method inside your {@link android.app.Activity} class:</p> + <pre> - final RadioButton radio_red = (RadioButton) findViewById(R.id.radio_red); - final RadioButton radio_blue = (RadioButton) findViewById(R.id.radio_blue); - radio_red.setOnClickListener(radio_listener); - radio_blue.setOnClickListener(radio_listener); +public void onRadioButtonClicked(View v) { + // Perform action on clicks + RadioButton rb = (RadioButton) v; + Toast.makeText(HelloFormStuff.this, rb.getText(), Toast.LENGTH_SHORT).show(); +} </pre> -<p>This captures each of the {@link android.widget.RadioButton}s from the layout and adds the -newly-created {@link android.view.View.OnClickListener} to each.</p> + +<p>When you specify this kind of method, which is used in your layout file with the {@code +android:onClick} +attribute, the method must be <code>public</code>, have a <code>void</code> return value, and +accept a single {@code android.view.View} parameter. When the system calls this method, it +passes the {@code android.view.View} that was clicked.</p> +<p>Because each {@link android.widget.RadioButton} widget is grouped into a {@link +android.widget.RadioGroup}, each widget handles its own state changes when a new button is +selected.</p> +</li> <li>Run the application.</li> </ol> @@ -303,31 +301,35 @@ element (inside the {@link android.widget.LinearLayout}): android:layout_width="wrap_content" android:layout_height="wrap_content" android:textOn="Vibrate on" - android:textOff="Vibrate off"/> + android:textOff="Vibrate off" + android:onClick="onToggleClicked"/> </pre> <p>The attributes <code>android:textOn</code> and <code>android:textOff</code> specify the text for the button when the button has been toggled on or off. The default values are "ON" and "OFF".</p> + <p>The attribute <code>android:onClick</code> specifies the name of a method in your activity +that the system should call when the user clicks the button. You'll create that method next.</p> </li> -<li>To do something when the state is changed, add the following code -to the end of the {@link android.app.Activity#onCreate(Bundle) onCreate()} method: +<li>To do something when the user clicks the button, add the following +method inside your {@link android.app.Activity} class:</p> + <pre> -final ToggleButton togglebutton = (ToggleButton) findViewById(R.id.togglebutton); -togglebutton.setOnClickListener(new OnClickListener() { - public void onClick(View v) { - // Perform action on clicks - if (togglebutton.isChecked()) { - Toast.makeText(HelloFormStuff.this, "Checked", Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(HelloFormStuff.this, "Not checked", Toast.LENGTH_SHORT).show(); - } +public void onToggleClicked(View v) { + // Perform action on clicks + if (((ToggleButton) v).isChecked()) { + Toast.makeText(HelloFormStuff.this, "Toggle on", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(HelloFormStuff.this, "Toggle off", Toast.LENGTH_SHORT).show(); } -}); +} </pre> -<p>This captures the {@link android.widget.ToggleButton} element from the layout, then adds an -{@link android.view.View.OnClickListener}. The {@link android.view.View.OnClickListener} must -implement the {@link android.view.View.OnClickListener#onClick(View)} callback method, which -defines the action to perform when the button is clicked. In this example, the callback + +<p>When you specify this kind of method, which is used in your layout file with the {@code +android:onClick} +attribute, the method must be <code>public</code>, have a <code>void</code> return value, and +accept a single {@code android.view.View} parameter. When the system calls this method, it +passes the {@code android.view.View} that was clicked.</p> +<p>In this example, the callback method checks the new state of the button, then shows a {@link android.widget.Toast} message that indicates the current state.</p> diff --git a/docs/html/resources/tutorials/views/hello-mapview.jd b/docs/html/resources/tutorials/views/hello-mapview.jd index ac5e826..7a0bedf 100644 --- a/docs/html/resources/tutorials/views/hello-mapview.jd +++ b/docs/html/resources/tutorials/views/hello-mapview.jd @@ -208,7 +208,7 @@ public int size() { new class constructor: <pre> public HelloItemizedOverlay(Drawable defaultMarker, Context context) { - super(defaultMarker); + super(boundCenterBottom(defaultMarker)); mContext = context; } </pre> |