diff options
author | Scott Main <smain@google.com> | 2012-08-13 19:12:13 -0700 |
---|---|---|
committer | Scott Main <smain@google.com> | 2012-08-13 19:12:13 -0700 |
commit | 183bf116978e3c44292c9ead2bceb47e972624a1 (patch) | |
tree | 9c612f9b9c61fcfb3661a1022c3dd414b5ecb7c2 /docs/html | |
parent | 3e504ac71715a1b152494c9765f41d13bc605b75 (diff) | |
download | frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.zip frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.tar.gz frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.tar.bz2 |
docs: misc bug fixes from external issues
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
Diffstat (limited to 'docs/html')
-rw-r--r-- | docs/html/guide/topics/media/camera.jd | 2 | ||||
-rw-r--r-- | docs/html/guide/topics/ui/controls/radiobutton.jd | 2 | ||||
-rw-r--r-- | docs/html/guide/topics/ui/settings.jd | 2 | ||||
-rw-r--r-- | docs/html/training/basics/activity-lifecycle/starting.jd | 2 | ||||
-rw-r--r-- | docs/html/training/basics/firstapp/starting-activity.jd | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd index a63270a..3fe23f8 100644 --- a/docs/html/guide/topics/media/camera.jd +++ b/docs/html/guide/topics/media/camera.jd @@ -617,7 +617,7 @@ public class CameraActivity extends Activity { // Create our Preview view and set it as the content of our activity. mPreview = new CameraPreview(this, mCamera); - FrameLayout preview = (FrameLayout) findViewById(id.camera_preview); + FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview); preview.addView(mPreview); } } diff --git a/docs/html/guide/topics/ui/controls/radiobutton.jd b/docs/html/guide/topics/ui/controls/radiobutton.jd index f6f6d49..c96e576 100644 --- a/docs/html/guide/topics/ui/controls/radiobutton.jd +++ b/docs/html/guide/topics/ui/controls/radiobutton.jd @@ -72,7 +72,7 @@ click event for both radio buttons:</p> <pre> public void onRadioButtonClicked(View view) { // Is the button now checked? - boolean checked = (RadioButton) view).isChecked(); + boolean checked = ((RadioButton) view).isChecked(); // Check which radio button was clicked switch(view.getId()) { diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd index fd3b684..33e164b 100644 --- a/docs/html/guide/topics/ui/settings.jd +++ b/docs/html/guide/topics/ui/settings.jd @@ -217,7 +217,7 @@ item in the list of settings.</p> android:dialogTitle="@string/pref_syncConnectionType" android:entries="@array/pref_syncConnectionTypes_entries" android:entryValues="@array/pref_syncConnectionTypes_values" - android:defaultValue="@string/pref_syncConnectionTypes_default" > + android:defaultValue="@string/pref_syncConnectionTypes_default" /> </PreferenceScreen> </pre> diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd index 1a4bc2d..dd17304 100644 --- a/docs/html/training/basics/activity-lifecycle/starting.jd +++ b/docs/html/training/basics/activity-lifecycle/starting.jd @@ -112,7 +112,7 @@ methods.</p> </table> --> -<p>As you'll learn in the following lessons, there are several situtations in which an activity +<p>As you'll learn in the following lessons, there are several situations in which an activity transitions between different states that are illustrated in figure 1. However, only three of these states can be static. That is, the activity can exist in one of only three states for an extended period of time:</p> diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index 4d0a84a..3dafcfa 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -285,8 +285,8 @@ href="{@docRoot}tools/extras/support-library.html#SettingUp">setting up the Supp <p>The app is now runnable because the {@link android.content.Intent} in the first activity now resolves to the {@code DisplayMessageActivity} class. If you run the app now, -clicking the Send button starts the -second activity, but it doesn't show anything yet.</p> +clicking the Send button starts the second activity, but it's still using the default +"Hello world" layout.</p> <h2 id="ReceiveIntent">Receive the Intent</h2> |