From f54574a90cb2c09af7fb5518e3e859726ce75027 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Wed, 24 Mar 2010 17:18:01 -0700 Subject: docs: clean docs to use consistent "sidebox" classes (eliminate sidebox-inner) Change-Id: I8a2a343257b055b5447bca03a98e48ad4387ff42 --- docs/html/guide/appendix/g-app-intents.jd | 5 +- docs/html/guide/developing/device.jd | 2 +- docs/html/guide/developing/tools/avd.jd | 2 +- docs/html/guide/topics/appwidgets/index.jd | 2 +- docs/html/guide/topics/fundamentals.jd | 2 +- docs/html/guide/topics/intents/intents-filters.jd | 2 +- docs/html/guide/topics/ui/index.jd | 2 +- docs/html/guide/topics/ui/layout-objects.jd | 2 + docs/html/guide/topics/wireless/bluetooth.jd | 6 +- docs/html/guide/tutorials/hello-world.jd | 10 +- docs/html/guide/tutorials/notepad/index.jd | 16 +-- docs/html/guide/tutorials/notepad/notepad-ex1.jd | 95 ++++++------- docs/html/guide/tutorials/notepad/notepad-ex2.jd | 150 ++++++++++----------- docs/html/guide/tutorials/notepad/notepad-ex3.jd | 125 +++++++++-------- docs/html/intl/ja/guide/publishing/preparing.jd | 8 +- docs/html/intl/ja/guide/topics/fundamentals.jd | 2 +- docs/html/intl/ja/guide/tutorials/hello-world.jd | 7 +- .../intl/ja/resources/tutorials/hello-world.jd | 6 +- docs/html/resources/tutorials/hello-world.jd | 4 +- docs/html/sdk/1.1_r1/upgrading.jd | 2 +- docs/html/sdk/installing.jd | 2 +- docs/html/sdk/win-usb.jd | 2 +- 22 files changed, 231 insertions(+), 223 deletions(-) diff --git a/docs/html/guide/appendix/g-app-intents.jd b/docs/html/guide/appendix/g-app-intents.jd index 2846859..df9d29b 100644 --- a/docs/html/guide/appendix/g-app-intents.jd +++ b/docs/html/guide/appendix/g-app-intents.jd @@ -1,8 +1,11 @@ page.title=Intents List: Invoking Google Applications on Android Devices @jd:body +
-For more information about intents, see the Intents and Intent Filters. +For more information about intents, see the Intents and Intent Filters. +

The table below lists the intents that your application can send, to invoke Google applications on Android devices in certain ways. For each action/uri pair, the table describes how the receiving Google application handles the intent.

diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 8fa4cec..22c099f 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -55,7 +55,7 @@ you'll need a developer device such as the Android Dev Ph

Android Dev Phone 1

-
+

Selected specs for Android Dev Phone 1:

  • Touch screen
    • diff --git a/docs/html/guide/developing/tools/avd.jd b/docs/html/guide/developing/tools/avd.jd index 06b1245..acebb7e 100644 --- a/docs/html/guide/developing/tools/avd.jd +++ b/docs/html/guide/developing/tools/avd.jd @@ -93,7 +93,7 @@ Other IDEs    , as appropriate for your environment.

    Creating an AVD

    -
    +

    The Android SDK does not include any preconfigured AVDs, so you need to create an AVD before you can run any application in the emulator (even the Hello World application).

    diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd index f36b684..7a8dd59 100644 --- a/docs/html/guide/topics/appwidgets/index.jd +++ b/docs/html/guide/topics/appwidgets/index.jd @@ -220,7 +220,7 @@ following layout classes:

    Using the AppWidgetProvider Class

    -
    +

    You must declare your AppWidgetProvider class implementation as a broadcast receiver using the <receiver> element in the AndroidManifest (see Declaring an App Widget in the Manifest above).

    diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd index c10af8e..807c7ff 100644 --- a/docs/html/guide/topics/fundamentals.jd +++ b/docs/html/guide/topics/fundamentals.jd @@ -1180,7 +1180,7 @@ to commit data changes and otherwise prepare to stop interacting with the user.

    -
    +

    Calling into the superclass

    An implementation of any activity lifecycle method should always first diff --git a/docs/html/guide/topics/intents/intents-filters.jd b/docs/html/guide/topics/intents/intents-filters.jd index 110721d..bd1d694 100644 --- a/docs/html/guide/topics/intents/intents-filters.jd +++ b/docs/html/guide/topics/intents/intents-filters.jd @@ -392,7 +392,7 @@ section, later.)

    -
    +

    Filters and security

    An intent filter cannot be relied on for security. While it opens a component to receiving only certain kinds of implicit intents, it does diff --git a/docs/html/guide/topics/ui/index.jd b/docs/html/guide/topics/ui/index.jd index 494bda8..abcf6be 100644 --- a/docs/html/guide/topics/ui/index.jd +++ b/docs/html/guide/topics/ui/index.jd @@ -107,7 +107,7 @@ complex layout.

    For more on building a UI layout, read Declaring Layout.

    -
    +

    Tip: You can also draw View and ViewGroups objects in Java code, using the {@link android.view.ViewGroup#addView(View)} methods to dynamically insert new View and ViewGroup objects.

    diff --git a/docs/html/guide/topics/ui/layout-objects.jd b/docs/html/guide/topics/ui/layout-objects.jd index 345e9b3..8b2792d 100644 --- a/docs/html/guide/topics/ui/layout-objects.jd +++ b/docs/html/guide/topics/ui/layout-objects.jd @@ -55,6 +55,7 @@ If the third box is then given a weight of 2 (instead of 0), then it is now decl "more important" than both the others, so it gets half the total remaining space, while the first two share the rest equally.

    +

    Tip: To create a proportionate size layout on the screen, create a container view group object with the @@ -64,6 +65,7 @@ the children height or width to 0 (zero); to each child, depending on what proportion of the screen each should have.

    +

    The following two forms represent a {@link android.widget.LinearLayout LinearLayout} with a set of elements: a button, some labels and text boxes. The text boxes have their width set to fill_parent; other diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index 80aa0d7..a8ff007 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -466,7 +466,8 @@ android.bluetooth.BluetoothServerSocket}, the {@link android.bluetooth.BluetoothServerSocket} can (and should) be discarded, unless you want to accept more connections.

    -
    +
    +

    About UUID

    A Universally Unique Identifier (UUID) is a standardized 128-bit format for a string @@ -476,7 +477,8 @@ used to uniquely identify your application's Bluetooth service. To get a UUID to use with your application, you can use one of the many random UUID generators on the web, then initialize a {@link java.util.UUID} with {@link java.util.UUID#fromString(String)}.

    -
    +
    +

    Here's the basic procedure to set up a server socket and accept a connection:

    diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd index f6b54ff..6e315b2 100644 --- a/docs/html/guide/tutorials/hello-world.jd +++ b/docs/html/guide/tutorials/hello-world.jd @@ -35,7 +35,7 @@ here when you've completed the installation.

    Create an AVD

    -
    +

    To learn more about how to use AVDs and the options available to you, refer to the Android @@ -243,7 +243,7 @@ to see it running.

    -
    +

    To learn more about creating and editing run configurations in Eclipse, refer to Developing In Eclipse, with ADT.

    @@ -357,12 +357,14 @@ short for "resources" and the directory contains all the non-code assets that your application requires. In addition to layout files, resources also include assets such as images, sounds, and localized strings.

    +

    Landscape layout

    When you want a different design for landscape, put your layout XML file inside /res/layout-land. Android will automatically look here when the layout changes. Without this special landscape layout defined, Android will stretch the default layout.

    +

    The Eclipse plugin automatically creates one of these layout files for you: main.xml. In the "Hello World" application you just completed, this file was ignored and you created a @@ -478,12 +480,12 @@ particularly powerful with the code-completion features of IDEs like Eclipse because it lets you quickly and interactively locate the specific reference you're looking for.

    -

    It's possible yours looks slightly different than this (perhaps the hexadecimal values are different). +

    It's possible yours looks slighly different than this (perhaps the hexadecimal values are different). For now, notice the inner class named "layout", and its member field "main". The Eclipse plugin noticed the XML layout file named main.xml and generated a class for it here. As you add other resources to your project (such as strings in the res/values/string.xml file or drawables inside -the res/drawable/ directory) you'll see R.java change to keep up.

    +the res/drawable/ direcory) you'll see R.java change to keep up.

    When not using Eclipse, this class file will be generated for you at build time (with the Ant tool).

    You should never edit this file by hand.

    diff --git a/docs/html/guide/tutorials/notepad/index.jd b/docs/html/guide/tutorials/notepad/index.jd index 6319fad..f569314 100644 --- a/docs/html/guide/tutorials/notepad/index.jd +++ b/docs/html/guide/tutorials/notepad/index.jd @@ -20,7 +20,7 @@ Android application and will have learned many of the most important concepts in Android development. If you want to add more complex features to your application, you can examine the code in an alternative implementation of a Note Pad application, in the -Sample Code section.

    +Sample Code section.

    @@ -46,7 +46,7 @@ should read Application Fundamentals before continuing.

    This tutorial also builds on the introductory information provided in the -Hello World +Hello World tutorial, which explains how to set up your Eclipse environment for building Android applications. We recommend you complete the Hello World tutorial before starting this one.

    @@ -81,7 +81,7 @@ previous exercises.

    table lists the tutorial examples and describes what each covers. "> - Exercise + Exercise 1 Start here. Construct a simple notes list that lets the user add new notes but not edit them. Demonstrates the basics of ListActivity and creating @@ -89,7 +89,7 @@ and handling menu options. Uses a SQLite database to store the notes. - Exercise 2 + Exercise 2 Add a second Activity to the application. Demonstrates constructing a new Activity, adding it to the Android manifest, passing data between the @@ -98,13 +98,13 @@ invoke another Activity to return a result, using startActivityForResult(). - Exercise 3 + Exercise 3 Add handling of life-cycle events to the application, to let it maintain application state across the life cycle. - Extra + Extra Credit Demonstrates how to use the Eclipse debugger and how you can use it to @@ -119,11 +119,11 @@ highly recommended.
    • For a lighter but broader introduction to concepts not covered in the tutorial, -take a look at Common Android Tasks.
      • +take a look at Common Android Tasks.
    • The Android SDK includes a variety of fully functioning sample applications that make excellent opportunities for further learning. You can find the sample applications in the samples/ directory of your downloaded SDK, or browser them -here, in the Sample Code section.
      • +here, in the Sample Code section.
    • This tutorial draws from the full Notepad application included in the samples/ directory of the SDK, though it does not match it exactly. When you are done with the tutorial, diff --git a/docs/html/guide/tutorials/notepad/notepad-ex1.jd b/docs/html/guide/tutorials/notepad/notepad-ex1.jd index b5173b8..cf7765e 100644 --- a/docs/html/guide/tutorials/notepad/notepad-ex1.jd +++ b/docs/html/guide/tutorials/notepad/notepad-ex1.jd @@ -33,7 +33,7 @@ selections.

      • Notepadv1 is a project that is provided as a starting point. It takes care of some of the boilerplate work that you have already seen if you - followed the Hello, + followed the Hello, World tutorial.

        @@ -44,7 +44,7 @@ selections. In the New Android Project dialog, select Create project from existing source.
      1. Click Browse and navigate to where you copied the NotepadCodeLab - (downloaded during setup) + (downloaded during setup) and select Notepadv1.
      2. The Project Name and other properties should be automatically filled for you. @@ -64,23 +64,22 @@ selections.

        3. Step 2

        -
        -

        Accessing and modifying data

        -

        For this +

        +
        +

        Accessing and modifying data

        +

        For this exercise, we are using a SQLite database to store our data. This is useful if only your application will need to access or modify the data. If you wish for other activities to access or modify the data, you have to expose the data using a {@link android.content.ContentProvider ContentProvider}.

        -

        If you are interested, you can find out more about - content providers or the whole +

        If you are interested, you can find out more about + content providers or the +whole subject of Data Storage. The NotePad sample in the samples/ folder of the SDK also has an example of how to create a ContentProvider.

        +

        Take a look at the NotesDbAdapter class — this class is provided to encapsulate data access to a SQLite database that will hold our notes data @@ -137,25 +136,22 @@ selections.

        Step 3

        -
        -

        Layouts and activities

        -

        Most Activity classes will have a layout associated with them. The layout +

        +
        +

        Layouts and activities

        +

        Most Activity classes will have a layout associated with them. The layout will be the "face" of the Activity to the user. In this case our layout will take over the whole screen and provide a list of notes.

        -

        Full screen layouts are not the only option for an Activity however. You +

        Full screen layouts are not the only option for an Activity however. You might also want to use a floating +href="{@docRoot}resources/faq/commontasks.html#floatingorfull">floating layout (for example, a dialog +href="{@docRoot}resources/faq/commontasks.html#dialogsandalerts">dialog or alert), or perhaps you don't need a layout at all (the Activity will be invisible to the user unless you specify some kind of layout for it to use).

        -
        +
        +

        Open the notepad_list.xml file in res/layout and @@ -233,23 +229,22 @@ and

        Step 5

        -
        -

        Resources and the R class

        -

        The folders under res/ in the Eclipse project are for resources. - There is a specific structure to the +

        +
        +

        Resources and the R class

        +

        The folders under res/ in the Eclipse project are for resources. + There is a specific structure +to the folders and files under res/.

        -

        Resources defined in these folders and files will have +

        Resources defined in these folders and files will have corresponding entries in the R class allowing them to be easily accessed and used from your application. The R class is automatically generated using the contents of the res/ folder by the eclipse plugin (or by aapt if you use the command line tools). Furthermore, they will be bundled and deployed for you as part of the application.

        +
        +

        To make the list of notes in the ListView, we also need to define a View for each row:

        1. @@ -373,20 +368,18 @@ Notepadv1

          Step 9

          -
          -

          More on menus

          -

          The notepad application we are constructing only scratches the - surface with menus.

          -

          You can also add -shortcut keys for menu items, create -submenus and even add +

          +
          +

          More about menus

          +

          The notepad application we are constructing only scratches the + surface with menus.

          +

          You can also add +shortcut keys for menu items, create +submenus and even add menu items to other applications!.

          +

          Fill out the body of the onCreateOptionsMenu() method.

          @@ -486,19 +479,17 @@ We will simply

          Step 12

          -
          -

          List adapters

          -

          Our example uses a {@link android.widget.SimpleCursorAdapter +

          +
          +

          List adapters

          +

          Our example uses a {@link android.widget.SimpleCursorAdapter SimpleCursorAdapter} to bind a database {@link android.database.Cursor Cursor} into a ListView, and this is a common way to use a {@link android.widget.ListAdapter ListAdapter}. Other options exist like {@link android.widget.ArrayAdapter ArrayAdapter} which can be used to take a List or Array of in-memory data and bind it in to a list as well.

          +

          Define the fillData() method:

          This diff --git a/docs/html/guide/tutorials/notepad/notepad-ex2.jd b/docs/html/guide/tutorials/notepad/notepad-ex2.jd index 3b8fa0b..a945a62 100644 --- a/docs/html/guide/tutorials/notepad/notepad-ex2.jd +++ b/docs/html/guide/tutorials/notepad/notepad-ex2.jd @@ -1,11 +1,11 @@ -page.title=Notepad Exercise 2 +Rpage.title=Notepad Exercise 2 parent.title=Notepad Tutorial parent.link=index.html @jd:body

          In this exercise, you will add a second Activity to your notepad application, to let the user -create and edit notes. You will also allow the user to delete existing notes through a context menu. +create and edit notes. You will also allow the user to delete existing notes through a context menu. The new Activity assumes responsibility for creating new notes by collecting user input and packing it into a return Bundle provided by the intent. This exercise demonstrates:

          @@ -55,7 +55,7 @@ Tools > Fix Project Properties.

        2. There are also a couple of new overridden methods - (onCreateContextMenu(), onContextItemSelected(), + (onCreateContextMenu(), onContextItemSelected(), onListItemClick() and onActivityResult()) which we will be filling in below.
          3. @@ -63,19 +63,20 @@ Tools > Fix Project Properties.

          Step 2

          - +

          Context menus should always be used when performing actions upon specific elements in the UI. When you register a View to a context menu, the context menu is revealed by performing a "long-click" on the UI component (press and hold the touchscreen or highlight and hold down the selection key for about two seconds).

          +

          First, let's create the context menu that will allow users to delete individual notes. Open the Notepadv2 class.

          1. In order for each list item in the ListView to register for the context menu, we call - registerForContextMenu() and pass it our ListView. So, at the very end of + registerForContextMenu() and pass it our ListView. So, at the very end of the onCreate() method add this line: 
            registerForContextMenu(getListView());

            Because our Activity extends the ListActivity class, getListView() will return us @@ -91,7 +92,7 @@ public boolean onCreateContextMenu(Menu menu, View v super.onCreateContextMenu(menu, v, menuInfo); menu.add(0, DELETE_ID, 0, R.string.menu_delete); } -

            The onCreateContextMenu() callback some passes other information in addition to the Menu object, +

            The onCreateContextMenu() callback passes some other information in addition to the Menu object, such as the View that has been triggered for the menu and an extra object that may contain additional information about the object selected. However, we don't care about these here, because we only have one kind of object in the Activity that uses context menus. In the next @@ -102,7 +103,7 @@ public boolean onCreateContextMenu(Menu menu, View v

            Step 3

            Now that the we've registered our ListView for a context menu and defined our context menu item, we need to handle the callback when it is selected. For this, we need to identify the list ID of the - selected item, then delete it. So fill in the + selected item, then delete it. So fill in the onContextItemSelected() method like this:

             public boolean onContextItemSelected(MenuItem item) {
@@ -122,26 +123,23 @@ method of our NotesDbAdapter and the note is deleted. That's it for the context
 can now be deleted.
            
 
 
            Step 4
            
-
            
-    
            Starting Other Activities
            
-    
            In this example our Intent uses a class name specifically.
-     As well as 
-     starting intents in 
-    classes we already know about, be they in our own application or another 
-    application, we can also create Intents without knowing exactly which 
+  
            
+  
            
+    
            Starting Other Activities
            
+    
            In this example our Intent uses a class name specifically.
+     As well as
+     starting intents in
+    classes we already know about, be they in our own application or another
+    application, we can also create Intents without knowing exactly which
     application will handle it.
            
-    
            For example, we might want to open a page in a 
+    
            For example, we might want to open a page in a
     browser, and for this we still use
     an Intent. But instead of specifying a class to handle it, we use
     a predefined Intent constant, and a content URI that describes what we
     want to do. See {@link android.content.Intent
     android.content.Intent} for more information.
            
-
            
+  
            
+  
            
 
 	
            Fill in the body of the createNote() method:
     
            Create a new Intent to create a note
@@ -155,7 +153,7 @@ startActivityForResult(i, ACTIVITY_CREATE);
            NoteEdit. Since the Intent class will need to communicate with the Android operating system to route requests, we also have to provide a Context (this).

            The startActivityForResult() method fires the Intent in a way that causes a method - in our Activity to be called when the new Activity is completed. The method in our Activity + in our Activity to be called when the new Activity is completed. The method in our Activity that receives the callback is called onActivityResult() and we will implement it in a later step. The other way to call an Activity is using startActivity() but this is a "fire-and-forget" way @@ -164,7 +162,7 @@ startActivityForResult(i, ACTIVITY_CREATE);

            Don't worry about the fact that NoteEdit doesn't exist yet, we will fix that soon.

            2. - +

            Step 5

            @@ -180,7 +178,7 @@ startActivityForResult(i, ACTIVITY_CREATE); interested in is the position that the user selected. We use this to get the data from the correct row, and bundle it up to send to the NoteEdit Activity.

            -

            In our implementation of the callback, the method creates an +

            In our implementation of the callback, the method creates an Intent to edit the note using the NoteEdit class. It then adds data into the extras Bundle of the Intent, which will be passed to the called Activity. We use it @@ -207,7 +205,7 @@ startActivityForResult(i, ACTIVITY_EDIT);

          2. The details of the note are pulled out from our query Cursor, which we move to the - proper position for the element that was selected in the list, with + proper position for the element that was selected in the list, with the moveToPosition() method.
          3. With the extras added to the Intent, we invoke the Intent on the NoteEdit class by passing startActivityForResult() @@ -219,7 +217,7 @@ startActivityForResult(i, ACTIVITY_EDIT); variable is much more efficient than accessing a field in the Dalvik VM, so by doing this we make only one access to the field, and five accesses to the local variable, making the routine much more efficient. It is recommended that you use this optimization when possible.

            - +

            Step 6

            @@ -243,7 +241,7 @@ startActivityForResult(i, ACTIVITY_EDIT);
          4. intent — this is an Intent created by the Activity returning results. It can be used to return data in the Intent "extras."
            5. -
    +

The combination of startActivityForResult() and onActivityResult() can be thought of as an asynchronous RPC (remote procedure call) and forms the recommended way for an Activity to invoke @@ -277,7 +275,7 @@ case ACTIVITY_EDIT: ACTIVITY_EDIT activity results in this method.

  • - In the case of a create, we pull the title and body from the extras (retrieved from the + In the case of a create, we pull the title and body from the extras (retrieved from the returned Intent) and use them to create a new note.
  • @@ -288,29 +286,27 @@ case ACTIVITY_EDIT: fillData() at the end ensures everything is up to date .
    • - +

    Step 7

    -
    -

    The Art of Layout

    -

    The provided +

    +
    +

    The Art of Layout

    +

    The provided note_edit.xml layout file is the most sophisticated one in the application we will be building, but that doesn't mean it is even close to the kind of sophistication you will be likely to want in real Android applications.

    -

    Creating a +

    Creating a good UI is part art and part science, and the rest is work. Mastery of Declaring Layout is an essential part of creating a good looking Android application.

    -

    Take a look at the - Hello Views +

    Take a look at the + Hello Views for some example layouts and how to use them. The ApiDemos sample project is also a great resource from which to learn how to create different layouts.

    +

    Open the file note_edit.xml that has been provided and take a look at it. This is the UI code for the Note Editor.

    @@ -335,7 +331,7 @@ case ACTIVITY_EDIT: layout_weight specified, so it takes up the minimum space required to render. If the layout_weight of each of the two text edit elements is set to 1, the remaining width in the parent layout will - be split equally between them (because we claim they are equally important). + be split equally between them (because we claim they are equally important). If the first one has a layout_weight of 1 and the second has a layout_weight of 2, then one third of the remaining space will be given to the first, and two thirds to the @@ -373,7 +369,7 @@ case ACTIVITY_EDIT: onCreate(Bundle) — and check the box next to it.
  • Click OK.

    The method should now appear in your class.

    • - +

    Step 9

    Fill in the body of the onCreate() method for NoteEdit.

    @@ -388,7 +384,7 @@ case ACTIVITY_EDIT:

    We can then unbundle the values that were passed in to the Activity with the extras Bundle attached to the calling Intent. We'll use them to pre-populate the title and body text edit views so that the user can edit them. - Then we will grab and store the mRowId so we can keep + Then we will grab and store the mRowId so we can keep track of what note the user is editing.

      @@ -406,14 +402,14 @@ case ACTIVITY_EDIT: mTitleText = (EditText) findViewById(R.id.title); mBodyText = (EditText) findViewById(R.id.body); Button confirmButton = (Button) findViewById(R.id.confirm); -

      Note that mTitleText and mBodyText are member +

      Note that mTitleText and mBodyText are member fields (you need to declare them at the top of the class definition).

    1. At the top of the class, declare a Long mRowId private field to store the current mRowId being edited (if any).
      2. -
    2. Continuing inside onCreate(), - add code to initialize the title, body and +
    3. Continuing inside onCreate(), + add code to initialize the title, body and mRowId from the extras Bundle in the Intent (if it is present):
      @@ -423,7 +419,7 @@ if (extras != null) {
     String title = extras.getString(NotesDbAdapter.KEY_TITLE);
     String body = extras.getString(NotesDbAdapter.KEY_BODY);
     mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
-           
+
     if (title != null) {
         mTitleText.setText(title);
     }
@@ -459,16 +455,16 @@ if (extras != null) {
 confirmButton.setOnClickListener(new View.OnClickListener() {
 
     public void onClick(View view) {
-               
+
     }
-           
+
 });

    Step 10

    Fill in the body of the onClick() method of the OnClickListener created in the last step.

    - +

    This is the code that will be run when the user clicks on the confirm button. We want this to grab the title and body text from the edit text fields, and put them into the return Bundle so that they can be passed @@ -483,7 +479,7 @@ confirmButton.setOnClickListener(new View.OnClickListener() { constants defined in Notepadv2 as keys:

     Bundle bundle = new Bundle();
-      
+
 bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
 bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
 if (mRowId != null) {
@@ -498,7 +494,7 @@ mIntent.putExtras(bundle);
 setResult(RESULT_OK, mIntent);
 finish();
      -
    • The Intent is simply our data carrier that carries our Bundle +
    • The Intent is simply our data carrier that carries our Bundle (with the title, body and mRowId).
    • The setResult() method is used to set the result code and return Intent to be passed back to the @@ -521,19 +517,19 @@ private Long mRowId; protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_edit); - + mTitleText = (EditText) findViewById(R.id.title); mBodyText = (EditText) findViewById(R.id.body); - + Button confirmButton = (Button) findViewById(R.id.confirm); - + mRowId = null; Bundle extras = getIntent().getExtras(); if (extras != null) { String title = extras.getString(NotesDbAdapter.KEY_TITLE); String body = extras.getString(NotesDbAdapter.KEY_BODY); mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID); - + if (title != null) { mTitleText.setText(title); } @@ -541,12 +537,12 @@ protected void onCreate(Bundle savedInstanceState) { mBodyText.setText(body); } } - + confirmButton.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Bundle bundle = new Bundle(); - + bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString()); bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString()); if (mRowId != null) { @@ -562,24 +558,22 @@ protected void onCreate(Bundle savedInstanceState) { }
      • - +

      Step 11

      -
      -

      The All-Important Android Manifest File

      -

      The AndroidManifest.xml file is the way in which Android sees your +

      +
      +

      The All-Important Android Manifest File

      +

      The AndroidManifest.xml file is the way in which Android sees your application. This file defines the category of the application, where it shows up (or even if it shows up) in the launcher or settings, what activities, services, and content providers it defines, what intents it can receive, and more.

      -

      For more information, see the reference document - The AndroidManifest.xml File

      -
      +

      For more information, see the reference document + The AndroidManifest.xml +File

      +
      +

      Finally, the new Activity has to be defined in the manifest file:

      Before the new Activity can be seen by Android, it needs its own @@ -597,10 +591,10 @@ protected void onCreate(Bundle savedInstanceState) {

    • Click the Application tab at the bottom of the Manifest editor.
    • Click Add... in the Application Nodes section. -

      If you see a dialog with radiobuttons at the top, select the top radio button: +

      If you see a dialog with radiobuttons at the top, select the top radio button: "Create a new element at the top level, in Application".

    • Make sure "(A) Activity" is selected in the selection pane of the dialog, and click OK.
      • -
    • Click on the new "Activity" node, in the Application Nodes section, then +
    • Click on the new "Activity" node, in the Application Nodes section, then type .NoteEdit into the Name* field to the right. Press Return/Enter.
      • @@ -608,28 +602,28 @@ protected void onCreate(Bundle savedInstanceState) { file, have a look around at some of the other options available (but be careful not to select them otherwise they will be added to your Manifest). This editor should help you understand and alter the AndroidManifest.xml file as you move on to more advanced Android applications.

      - +

      If you prefer to edit this file directly, simply open the AndroidManifest.xml file and look at the source (use the AndroidManifest.xml tab in the eclipse editor to see the source code directly). Then edit the file as follows:
      - <activity android:name=".NoteEdit"></activity>

      + <activity android:name=".NoteEdit" />

      This should be placed just below the line that reads:
      </activity> for the .Notepadv2 activity.

      Step 12

      Now Run it!

      -

      You should now be able to add real notes from -the menu, as well as delete an existing one. Notice that in order to delete, you must +

      You should now be able to add real notes from +the menu, as well as delete an existing one. Notice that in order to delete, you must first use the directional controls on the device to highlight the note. -Furthermore, selecting a note title from the list should bring up the note -editor to let you edit it. Press confirm when finished to save the changes +Furthermore, selecting a note title from the list should bring up the note +editor to let you edit it. Press confirm when finished to save the changes back to the database.

      Solution and Next Steps

      -

      You can see the solution to this exercise in Notepadv2Solution +

      You can see the solution to this exercise in Notepadv2Solution from the zip file to compare with your own.

      Now try editing a note, and then hitting the back button on the emulator instead of the confirm button (the back button is below the menu button). You diff --git a/docs/html/guide/tutorials/notepad/notepad-ex3.jd b/docs/html/guide/tutorials/notepad/notepad-ex3.jd index 8737280..573500f 100644 --- a/docs/html/guide/tutorials/notepad/notepad-ex3.jd +++ b/docs/html/guide/tutorials/notepad/notepad-ex3.jd @@ -36,7 +36,7 @@ notes.

      1. Remove the code in NoteEdit that parses the title and body - from the extras Bundle. + from the extras Bundle.

        Instead, we are going to use the DBHelper class to access the notes from the database directly. All we need passed into the NoteEdit Activity is a mRowId (but only if we are editing, if creating we pass @@ -57,7 +57,7 @@ if (body != null) { }

      - +

      Step 2

      Create a class field for a NotesDbAdapter at the top of the NoteEdit class:

      @@ -67,11 +67,11 @@ if (body != null) { 
           mDbHelper = new NotesDbAdapter(this);
      
     mDbHelper.open();
      - +

      Step 3

      In NoteEdit, we need to check the savedInstanceState for the -mRowId, in case the note +mRowId, in case the note editing contains a saved state in the Bundle, which we should recover (this would happen if our Activity lost focus and then restarted).

        @@ -87,11 +87,11 @@ if (body != null) { with this: 
        -        mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
-                                            : null;
+        mRowId = (savedInstanceState == null) ? null :
+            (Long) savedInstanceState.getSerializable(NotesDbAdapter.KEY_ROWID);
         if (mRowId == null) {
-            Bundle extras = getIntent().getExtras();            
-            mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
+            Bundle extras = getIntent().getExtras();
+            mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID)
                                     : null;
         }
        @@ -100,10 +100,15 @@ if (body != null) { Note the null check for savedInstanceState, and we still need to load up mRowId from the extras Bundle if it is not provided by the savedInstanceState. This is a ternary operator shorthand - to safely either use the value or null if it is not present. + to safely either use the value or null if it is not present. + +
      1. + Note the use of Bundle.getSerializable() instead of + Bundle.getLong(). The latter encoding returns a long primitive and + so can not be used to represent the case when mRowId is null.
      - +

      Step 4

      Next, we need to populate the fields based on the mRowId if we @@ -126,38 +131,38 @@ public void onClick(View view) { }

      We will take care of storing the updates or new notes in the database ourselves, using the life-cycle methods.

      - +

      The whole onCreate() method should now look like this:

       super.onCreate(savedInstanceState);
- 
+
 mDbHelper = new NotesDbAdapter(this);
 mDbHelper.open();
- 
+
 setContentView(R.layout.note_edit);
- 
+
 mTitleText = (EditText) findViewById(R.id.title);
 mBodyText = (EditText) findViewById(R.id.body);
- 
+
 Button confirmButton = (Button) findViewById(R.id.confirm);
- 
-mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
-                                    : null;
+
+mRowId = (savedInstanceState == null) ? null :
+    (Long) savedInstanceState.getSerializable(NotesDbAdapter.KEY_ROWID);
 if (mRowId == null) {
     Bundle extras = getIntent().getExtras();
-    mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
+    mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID)
                             : null;
 }
- 
+
 populateFields();
- 
+
 confirmButton.setOnClickListener(new View.OnClickListener() {
 
     public void onClick(View view) {
         setResult(RESULT_OK);
         finish();
     }
-     
+
 });

      Step 6

      @@ -180,38 +185,36 @@ is an Android convenience method provided to take care of the Cursor life-cycle. and re-create resources as dictated by the Activity life-cycle, so we don't need to worry about doing that ourselves. After that, we just look up the title and body values from the Cursor and populate the View elements with them.

      - +

      Step 7

      -
      -

      Why handling life-cycle events is important

      -

      If you are used to always having control in your applications, you - might not understand why all this life-cycle work is necessary. The reason - is that in Android, you are not in control of your Activity, the - operating system is!

      -

      As we have already seen, the Android model is based around activities - calling each other. When one Activity calls another, the current Activity - is paused at the very least, and may be killed altogether if the - system starts to run low on resources. If this happens, your Activity will - have to store enough state to come back up later, preferably in the same - state it was in when it was killed.

      -

      - Android has a well-defined life cycle. - Lifecycle events can happen even if you are not handing off control to - another Activity explicitly. For example, perhaps a call comes in to the - handset. If this happens, and your Activity is running, it will be swapped - out while the call Activity takes over.

      -
      - -

      Still in the NoteEdit class, we now override the methods - onSaveInstanceState(), onPause() and - onResume(). These are our life-cycle methods +

      +
      +

      Why handling life-cycle events is important

      +

      If you are used to always having control in your applications, you + might not understand why all this life-cycle work is necessary. The reason + is that in Android, you are not in control of your Activity, the + operating system is!

      +

      As we have already seen, the Android model is based around activities + calling each other. When one Activity calls another, the current Activity + is paused at the very least, and may be killed altogether if the + system starts to run low on resources. If this happens, your Activity will + have to store enough state to come back up later, preferably in the same + state it was in when it was killed.

      +

      + Android has a well-defined life +cycle. + Lifecycle events can happen even if you are not handing off control to + another Activity explicitly. For example, perhaps a call comes in to the + handset. If this happens, and your Activity is running, it will be swapped + out while the call Activity takes over.

      +
      +
      + +

      Still in the NoteEdit class, we now override the methods + onSaveInstanceState(), onPause() and + onResume(). These are our life-cycle methods (along with onCreate() which we already have).

      onSaveInstanceState() is called by Android if the @@ -241,8 +244,10 @@ and populate the View elements with them.

      @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId); + saveState(); + outState.putSerializable(NotesDbAdapter.KEY_ROWID, mRowId); } +

      We'll define saveState() next.

    • onPause(): @@ -252,7 +257,6 @@ and populate the View elements with them.

      super.onPause(); saveState(); } -

      We'll define saveState() next.

    • onResume(): @@ -264,6 +268,10 @@ and populate the View elements with them.

      }
      • +

      Note that saveState() must be called in both onSaveInstanceState() +and onPause() to ensure that the data is saved. This is because there is no +guarantee that onSaveInstanceState() will be called and because when it is +called, it is called before onPause().

      Step 8

      @@ -301,19 +309,18 @@ database.

      necessary. The resulting method should look like this:

       @Override
-protected void onActivityResult(int requestCode, int resultCode, 
-                                Intent intent) {
+protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
     super.onActivityResult(requestCode, resultCode, intent);
     fillData();
 }

      Because the other class now does the work, all this has to do is refresh the data.

      - +

      Step 10

      Also remove the lines which set the title and body from the - onListItemClick() method (again they are no longer needed, + onListItemClick() method (again they are no longer needed, only the mRowId is):

           Cursor c = mNotesCursor;
@@ -344,13 +351,13 @@ so that all that should be left in that method is:
   other occurrences of mNotesCursor in your fillData() method.
 
 
      
-Run it! (use Run As -> Android Application on the project right 
+Run it! (use Run As -> Android Application on the project right
 click menu again)
      
 
 
      Solution and Next Steps
      
 
 
      You can see the solution to this exercise in Notepadv3Solution
-from 
+from
 the zip file to compare with your own.
      
 
      
 When you are ready, move on to the Tutorial
diff --git a/docs/html/intl/ja/guide/publishing/preparing.jd b/docs/html/intl/ja/guide/publishing/preparing.jd
index f1e7b45..e232f3b 100644
--- a/docs/html/intl/ja/guide/publishing/preparing.jd
+++ b/docs/html/intl/ja/guide/publishing/preparing.jd
@@ -113,9 +113,13 @@ href="{@docRoot}guide/publishing/publishing.html#market">Android マーケット
 
 
      7. アプリケーションが MapView 要素を使用している場合は、Maps API キーに登録する
      
 
-
      
+
      
+
      
 Maps API キーを取得する方法は、Maps API キーの取得（英語のみ） をご覧ください。
      
+href="http://code.google.com/android/add-ons/google-apis/mapkey.html">Maps API キーの取得（英語のみ）
+をご覧ください。
      
+
      
+
      
 
 
      アプリケーションが Mapview 要素を使用する場合、アプリケーションを Google Maps サービスで登録し、Maps API キーを取得する必要があります。その後、MapView で Google Maps からデータを取得できるようになります。この処理を行うため、Maps サービスに署名証明書の MD5 フィンガープリントを提出します。 
      
 
diff --git a/docs/html/intl/ja/guide/topics/fundamentals.jd b/docs/html/intl/ja/guide/topics/fundamentals.jd
index 247d076..d329a8c 100644
--- a/docs/html/intl/ja/guide/topics/fundamentals.jd
+++ b/docs/html/intl/ja/guide/topics/fundamentals.jd
@@ -613,7 +613,7 @@ onServiceDisconnected()} メソッドが実装されているため、リ
 
      
 
 
      
-
      
+
      
 
      スーパークラスの呼び出し
      
 
      
 どのアクティビティ ライフサイクル メソッドの実装でも、必ず最初にスーパークラス バージョンを呼び出す必要があります。次に例を示します:
diff --git a/docs/html/intl/ja/guide/tutorials/hello-world.jd b/docs/html/intl/ja/guide/tutorials/hello-world.jd
index c12965c..647c828 100644
--- a/docs/html/intl/ja/guide/tutorials/hello-world.jd
+++ b/docs/html/intl/ja/guide/tutorials/hello-world.jd
@@ -25,7 +25,7 @@ page.title=Hello, World
 
      AVD の作成
      
 
 
      
-  
      
+  
      
     
      AVD の使用方法と使用可能なオプションについて詳しくは、Android 仮想デバイス のドキュメントを参照してください。
      
   
      
 
      
@@ -155,7 +155,7 @@ public class HelloAndroid extends Activity {
 
 
 
      
-  
      
+  
      
     
      Eclipse での起動構成の作成と編集について詳しくは、「ADT を使用した Eclipse での開発」を参照してください。
      
   
      
 
      
@@ -232,11 +232,12 @@ public class HelloAndroid extends Activity {
 
 
 
      これらの XML レイアウト ファイルは、作成するプロジェクトの res/layout/ ディレクトリ内に置かれます。「res」は「resources」の略で、アプリケーションに必要なコード以外のすべてのアセットがこのディレクトリに格納されます。リソースには、レイアウト ファイルの他に、画像、音声、ローカライズされた文字列などのアセットがあります。
      
-
+
      
 
      
   
      横表示レイアウト
      
   
      横表示の場合に異なるデザインで表示するには、レイアウト XML ファイルを /res/layout-land 内に入れます。Android 端末のレイアウトが横表示に変わると自動的にこのディレクトリが参照されます。このように横表示向けに定義されたレイアウトが存在しない場合、自動的にデフォルトのレイアウトが拡大して使用されます。
      
 
      
+
      
 
 
      Eclipse プラグインでは、このようなレイアウト ファイルの 1 つである「main.xml」が自動的に作成されます。先ほど「Hello World」アプリケーションを作成した際には、このファイルは無視してプログラマティックにレイアウトを作成しました。この作成方法は Android フレームワークについてより深く理解していただくことを意図したもので、実際にはほとんどの場合レイアウトはコードではなく XML ファイルで定義します。以下の手順では、既存のアプリケーションを変更して XML レイアウトが使用されるようにする方法を説明します。
      
 
diff --git a/docs/html/intl/ja/resources/tutorials/hello-world.jd b/docs/html/intl/ja/resources/tutorials/hello-world.jd
index c12965c..0cda2fb 100644
--- a/docs/html/intl/ja/resources/tutorials/hello-world.jd
+++ b/docs/html/intl/ja/resources/tutorials/hello-world.jd
@@ -25,7 +25,7 @@ page.title=Hello, World
 
      AVD の作成
      
 
 
      
-  
      
+  
      
     
      AVD の使用方法と使用可能なオプションについて詳しくは、Android 仮想デバイス のドキュメントを参照してください。
      
   
      
 
      
@@ -155,7 +155,7 @@ public class HelloAndroid extends Activity {
 
 
 
      
-  
      
+  
      
     
      Eclipse での起動構成の作成と編集について詳しくは、「ADT を使用した Eclipse での開発」を参照してください。
      
   
      
 
      
@@ -233,10 +233,12 @@ public class HelloAndroid extends Activity {
 
 
      これらの XML レイアウト ファイルは、作成するプロジェクトの res/layout/ ディレクトリ内に置かれます。「res」は「resources」の略で、アプリケーションに必要なコード以外のすべてのアセットがこのディレクトリに格納されます。リソースには、レイアウト ファイルの他に、画像、音声、ローカライズされた文字列などのアセットがあります。
      
 
+
      
 
      
   
      横表示レイアウト
      
   
      横表示の場合に異なるデザインで表示するには、レイアウト XML ファイルを /res/layout-land 内に入れます。Android 端末のレイアウトが横表示に変わると自動的にこのディレクトリが参照されます。このように横表示向けに定義されたレイアウトが存在しない場合、自動的にデフォルトのレイアウトが拡大して使用されます。
      
 
      
+
      
 
 
      Eclipse プラグインでは、このようなレイアウト ファイルの 1 つである「main.xml」が自動的に作成されます。先ほど「Hello World」アプリケーションを作成した際には、このファイルは無視してプログラマティックにレイアウトを作成しました。この作成方法は Android フレームワークについてより深く理解していただくことを意図したもので、実際にはほとんどの場合レイアウトはコードではなく XML ファイルで定義します。以下の手順では、既存のアプリケーションを変更して XML レイアウトが使用されるようにする方法を説明します。
      
 
diff --git a/docs/html/resources/tutorials/hello-world.jd b/docs/html/resources/tutorials/hello-world.jd
index 2b515a1..6e315b2 100644
--- a/docs/html/resources/tutorials/hello-world.jd
+++ b/docs/html/resources/tutorials/hello-world.jd
@@ -35,7 +35,7 @@ here when you've completed the installation.
      
 
      Create an AVD
      
 
 
      
-  
      
+  
      
     
      To learn more about how to use AVDs and the options 
        available to you, refer to the 
        Android 
@@ -243,7 +243,7 @@ to see it running.
      
 
 
 
      
-  
      
+  
      
     
      To learn more about creating and editing run configurations in Eclipse, refer to
     Developing In Eclipse, 
     with ADT.
      
diff --git a/docs/html/sdk/1.1_r1/upgrading.jd b/docs/html/sdk/1.1_r1/upgrading.jd
index 5628d04..bc71149 100644
--- a/docs/html/sdk/1.1_r1/upgrading.jd
+++ b/docs/html/sdk/1.1_r1/upgrading.jd
@@ -4,7 +4,7 @@ sdk.version=1.1_r1