From 369c1c1fa22802b6504c5cde533d797841700a66 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Tue, 7 Dec 2010 11:17:00 -0800 Subject: [PATCH] cherrypick Change-Id: I52bc4e2d34015e6e30887590f920b580a034180e docs: anchor link fixes Change-Id: I41175d61bb4ee2b0e087515e609e5ebfb19b1ea1 --- docs/html/guide/developing/eclipse-adt.jd | 6 +++--- docs/html/guide/developing/other-ide.jd | 2 +- .../guide/developing/testing/testing_eclipse.jd | 14 +++++--------- docs/html/guide/practices/screens_support.jd | 2 +- docs/html/guide/publishing/app-signing.jd | 2 +- docs/html/guide/publishing/preparing.jd | 2 +- docs/html/guide/publishing/versioning.jd | 2 +- docs/html/guide/topics/data/backup.jd | 10 +++++----- docs/html/guide/topics/graphics/index.jd | 4 ++-- docs/html/guide/topics/media/index.jd | 4 ++-- .../guide/topics/resources/drawable-resource.jd | 8 ++++---- docs/html/guide/topics/resources/more-resources.jd | 4 ++-- .../guide/topics/resources/providing-resources.jd | 2 +- .../html/guide/topics/resources/runtime-changes.jd | 2 +- docs/html/guide/topics/search/search-dialog.jd | 2 +- docs/html/guide/topics/ui/declaring-layout.jd | 3 +-- docs/html/guide/topics/ui/menus.jd | 2 +- docs/html/guide/topics/wireless/bluetooth.jd | 6 +++--- docs/html/sdk/eclipse-adt.jd | 2 +- docs/html/sdk/installing.jd | 4 ++-- docs/html/sdk/win-usb.jd | 2 +- 21 files changed, 40 insertions(+), 45 deletions(-) diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd index e8d2416bf2d75..f8d32e7be22c9 100644 --- a/docs/html/guide/developing/eclipse-adt.jd +++ b/docs/html/guide/developing/eclipse-adt.jd @@ -13,7 +13,7 @@ page.title=Developing In Eclipse, with ADT
  • Running on a device
    • -
  • Creating a Custom Run Configuration
    • +
  • Creating a Run Configuration
  • Setting Up Application Signing
  • Working with Library Projects
      @@ -222,7 +222,7 @@ debugger is attached, Eclipse will open the Debug perspective.

      To set or change the launch configuration used for your project, use the launch configuration manager. -See Creating a Launch Configuration for information.

      +See Creating a Run Configuration for information.

      Be certain to create multiple AVDs upon which to test your application. You should have one AVD for each platform and screen type with which your application is compatible. For @@ -296,7 +296,7 @@ configuration

    1. Adjust your desired launch configuration settings.

      In the Target tab, consider whether you'd like to use Manual or Automatic mode when selecting an AVD to run your application. - See the following section on Automatic and manual target + See the following section on Automatic and manual target modes).

      You can specify any emulator options to the Additional Emulator Command Line Options field. For example, you could add -scale 96dpi to diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd index 95b36802d59e4..234b18fa751cd 100644 --- a/docs/html/guide/developing/other-ide.jd +++ b/docs/html/guide/developing/other-ide.jd @@ -804,7 +804,7 @@ href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xmlTo build an application project that depends on one or more library projects, you can use the standard Ant build commands and compile modes, as described in -Building Your Application, earlier in this document. The +Building Your Application, earlier in this document. The tools compile and merge all libraries referenced by the application as part of compiling the dependent application project. No additional commands or steps are necessary.

      diff --git a/docs/html/guide/developing/testing/testing_eclipse.jd b/docs/html/guide/developing/testing/testing_eclipse.jd index ba7eabafdc47f..370c1426069e7 100644 --- a/docs/html/guide/developing/testing/testing_eclipse.jd +++ b/docs/html/guide/developing/testing/testing_eclipse.jd @@ -505,15 +505,14 @@ page.title=Testing In Eclipse, with ADT pane and moves the focus to the first line of the test method.

      - The results of a successful test are shown in - Figure 1. Messages for a successful test: + The results of a successful test are shown in figure 1.

      Messages for a successful test

      - Figure 1. Messages for a successful test + Figure 1. Messages for a successful test.

      The lower pane is for stack traces. If you highlight a failed test in the upper pane, the @@ -521,14 +520,11 @@ page.title=Testing In Eclipse, with ADT test code, you can double-click it to display the code in an editor view pane, with the line highlighted. For a successful test, the lower pane is empty.

      -

      - The results of a failed test are shown in - Figure 2. Messages for a test failure -

      +

      The results of a failed test are shown in figure 2.

      Messages for a test failure + alt="" height="372px" id="TestRun"/>

      - Figure 2. Messages for a test failure + Figure 2. Messages for a test failure.

      diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd index b70be0781d4aa..f503749d2ff14 100644 --- a/docs/html/guide/practices/screens_support.jd +++ b/docs/html/guide/practices/screens_support.jd @@ -214,7 +214,7 @@ screen.

      Table 1. Screen sizes and densities of emulator skins included in the Android SDK.

      - +
      diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd index 67580545c7d74..c7e1c79780b18 100644 --- a/docs/html/guide/publishing/app-signing.jd +++ b/docs/html/guide/publishing/app-signing.jd @@ -563,7 +563,7 @@ and align, as discussed above. Once the wizard has compiled and signed your pack it will also perfom package alignment with {@code zipalign}. Because the Export Wizard uses both Keytool and Jarsigner, you should ensure that they are accessible on your computer, as described above -in the Basic Setup for Signing.

      +in the Basic Setup for Signing.

      To create a signed and aligned .apk in Eclipse:

      diff --git a/docs/html/guide/publishing/preparing.jd b/docs/html/guide/publishing/preparing.jd index 45a5b77797922..f4719610f2d26 100644 --- a/docs/html/guide/publishing/preparing.jd +++ b/docs/html/guide/publishing/preparing.jd @@ -89,7 +89,7 @@ application

      To protect your person, organization, and intellectual property, you may want to provide an End User License Agreement (EULA) with your application. -

      3. Consider adding support for Android Market Licensing

      +

      3. Consider adding support for Android Market Licensing

      If you are publishing a paid application through Android Market, consider adding support for Android Market Licensing. Licensing lets you control access diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd index b646247b011d7..01bfba85d4e5e 100644 --- a/docs/html/guide/publishing/versioning.jd +++ b/docs/html/guide/publishing/versioning.jd @@ -16,7 +16,7 @@ page.title=Versioning Your Applications

      In this document

        -
      1. Setting Application Version
        2. +
      2. Setting Application Version
      3. Specifying Your Application's System API Requirements
      diff --git a/docs/html/guide/topics/data/backup.jd b/docs/html/guide/topics/data/backup.jd index 7661a0e5f7282..dec21467d71ba 100644 --- a/docs/html/guide/topics/data/backup.jd +++ b/docs/html/guide/topics/data/backup.jd @@ -124,7 +124,7 @@ order for it to work. Any other backup services available might also require you in order to store your data on their servers.
    2. Define a backup agent by either:

        -
      1. Extending BackupAgent +
      2. Extending BackupAgent

        The {@link android.app.backup.BackupAgent} class provides the central interface with which your application communicates with the Backup Manager. If you extend this class directly, you must override {@link @@ -133,7 +133,7 @@ onBackup()} and {@link android.app.backup.BackupAgent#onRestore(BackupDataInput,int,ParcelFileDescriptor) onRestore()} to handle the backup and restore operations for your data.

        Or

        -
      3. Extending BackupAgentHelper +
      4. Extending BackupAgentHelper

        The {@link android.app.backup.BackupAgentHelper} class provides a convenient wrapper around the {@link android.app.backup.BackupAgent} class, which minimizes the amount of code you need to write. In your {@link android.app.backup.BackupAgentHelper}, you must use one or more @@ -278,7 +278,7 @@ must implement the following callback methods:

        {@link android.app.backup.BackupAgent#onBackup(ParcelFileDescriptor,BackupDataOutput,ParcelFileDescriptor) onBackup()}
        -
        The Backup Manager calls this method after you request a +
        The Backup Manager calls this method after you request a backup. In this method, you read your application data from the device and pass the data you want to back up to the Backup Manager, as described below in Performing backup.
        @@ -287,8 +287,8 @@ backup. android.app.backup.BackupAgent#onRestore(BackupDataInput,int,ParcelFileDescriptor) onRestore()}
        The Backup Manager calls this method during a restore operation (you can request a restore, but the system automatically performs restore when the -user re-installs your application). When it calls this method, the Backup Manager delivers your +href="#RequestingRestore">request a restore, but the system automatically performs restore when +the user re-installs your application). When it calls this method, the Backup Manager delivers your backup data, which you then restore to the device, as described below in Performing restore.
        diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd index 92771a8f72af3..be1b0fc7b834f 100644 --- a/docs/html/guide/topics/graphics/index.jd +++ b/docs/html/guide/topics/graphics/index.jd @@ -31,8 +31,8 @@ for an interactive game or 3D rendering.

        and which tasks they're best suited for.

        If you're specifically looking for information on drawing 3D graphics, this page won't -help a lot. However, the information below, on Drawing with a Canvas -(and the section on SurfaceView), +help a lot. However, the information below about how to Draw with a +Canvas (and the section on SurfaceView), will give you a quick idea of how you should draw to the View hierarchy. For more information on Android's 3D graphic utilities (provided by the OpenGL ES API), read 3D with OpenGL and refer to other OpenGL documentation.

        diff --git a/docs/html/guide/topics/media/index.jd b/docs/html/guide/topics/media/index.jd index 558d4535e2e0b..8e18754a6b16c 100644 --- a/docs/html/guide/topics/media/index.jd +++ b/docs/html/guide/topics/media/index.jd @@ -14,7 +14,7 @@ page.title=Audio and Video

        In this document

          -
        1. Audio and Video Playback +
        2. Audio and Video Playback
          1. Playing from a Raw Resource
          2. Playing from a File or Stream
            3. @@ -63,7 +63,7 @@ capabilities, accessible through the MediaRecorder class.

            see the             Android Media Formats appendix.

            -

            Audio and Video Playback

            +

            Audio and Video Playback

            Media can be played from anywhere: from a raw resource, from a file from the system, or from an available network (URL).

            diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index 9ebed56d13aa4..79ce6696f644a 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -381,7 +381,7 @@ In XML: @[package:]drawable/filename 
             <?xml version="1.0" encoding="utf-8"?>
-<nine-patch
+<nine-patch
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:src="@[package:]drawable/drawable_resource"
     android:dither=["true" | "false"] />
@@ -394,8 +394,8 @@ In XML: @[package:]drawable/filename
 
            
 
            
 
-  
            <bitmap>
            
-    
            Defines the bitmap source and its properties.
+  
            <nine-patch>
            
+    
            Defines the Nine-Patch source and its properties.
       
            attributes:
            
       
            
         
            xmlns:android
            
@@ -1613,7 +1613,7 @@ href="more-resources.html#Dimension">dimension resource.
            
 href="more-resources.html#Dimension">dimension resource.
            -
            <size>
            +
            <size>
            The size of the shape.

            attributes:

            diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd index 6cae1eb4153cf..5f4d5c2cace56 100644 --- a/docs/html/guide/topics/resources/more-resources.jd +++ b/docs/html/guide/topics/resources/more-resources.jd @@ -369,11 +369,11 @@ In XML: @[package:]id/name
            -
            <resources>
            +
            <resources>
            Required. This must be the root node.

            No attributes.

            -
            <integer>
            +
            <item>
            Defines a unique ID. Takes no value, only attributes.

            attributes:

            diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 4f3b0da2ad071..5d00db162b587 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -749,7 +749,7 @@ you always provide default resources for each type of resource that your applica

            For example, if your application supports several languages, always include a {@code values/} directory (in which your strings are saved) without a language and region qualifier. If you instead put all your string files +href="#LocaleQualifier">language and region qualifier. If you instead put all your string files in directories that have a language and region qualifier, then your application will crash when run on a device set to a language that your strings do not support. But, as long as you provide default {@code values/} resources, then your application will run properly (even if the user doesn't diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd index d75ff4d1b9905..e685c9b830af6 100644 --- a/docs/html/guide/topics/resources/runtime-changes.jd +++ b/docs/html/guide/topics/resources/runtime-changes.jd @@ -51,7 +51,7 @@ restoring significant amounts of data can be costly and create a poor user exper situation, you have two options:

              -
            1. Retain an object during a configuration change +
            2. Retain an object during a configuration change

              Allow your Activity to restart when a configuration changes, but carry a stateful {@link java.lang.Object} to the new instance of your Activity.

              diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index 49938b4e14abb..ea8dc1cb29139 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -461,7 +461,7 @@ private void handleIntent(Intent intent) { } -

              Compared to the example code in the section about Performing a +

              Compared to the example code in the section about Performing a Search, all the code to handle the search Intent is now in the {@code handleIntent()} method, so that both {@link android.app.Activity#onCreate(Bundle) diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index fe641a2d6602e..f95a89bf8adef 100644 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -16,8 +16,7 @@ parent.link=index.html

          3. Position
            4. -
          4. Size, Padding and Margins
            5. -
          5. Example Layout
            6. +
          6. Size, Padding and Margins

          Key classes

          diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd index b4e467c273f2d..42790b63ebc14 100644 --- a/docs/html/guide/topics/ui/menus.jd +++ b/docs/html/guide/topics/ui/menus.jd @@ -515,7 +515,7 @@ set is visible.

          Checkable menu items are intended to be used only on a per-session basis and not saved after the application is destroyed. If you have application settings that you would like to save for the user, you should store the data using Shared Preferences.

          +href="{@docRoot}guide/topics/data/data-storage.html#pref">Shared Preferences.

          Shortcut keys

          diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index 98b6e7d278d6b..b3c768715776f 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -432,7 +432,7 @@ client are considered connected to each other when they each have a connected {@link android.bluetooth.BluetoothSocket} on the same RFCOMM channel. At this point, each device can obtain input and output streams and data transfer can begin, which is discussed in the section about Managing a Connection. This section describes how +href="#ManagingAConnection">Managing a Connection. This section describes how to initiate the connection between two devices.

          The server device and the client device each obtain the required {@link @@ -603,7 +603,7 @@ client-side).

          manageConnectedSocket() is a fictional method in the application that will initiate the thread for transferring data, which is discussed in the section -about Managing a Connection.

          +about Managing a Connection.

          You should usually close your {@link android.bluetooth.BluetoothServerSocket} as soon as you are done listening for incoming connections. In this example, {@link @@ -724,7 +724,7 @@ check, call {@link android.bluetooth.BluetoothAdapter#isDiscovering()}).

          manageConnectedSocket() is a fictional method in the application that will initiate the thread for transferring data, which is discussed in the section -about Managing a Connection.

          +about Managing a Connection.

          When you're done with your {@link android.bluetooth.BluetoothSocket}, always call {@link android.bluetooth.BluetoothSocket#close()} to clean up. diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index a50979de014a6..cc0260a62df93 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -496,7 +496,7 @@ In the dialog that appears, click the Available Software tab.

      3. -

      Configuring the ADT Plugin

      +

      Configuring the ADT Plugin

      Once you've successfully downloaded ADT as described above, the next step is to modify your ADT preferences in Eclipse to point to the Android SDK directory:

      diff --git a/docs/html/sdk/installing.jd b/docs/html/sdk/installing.jd index 4cb1bb22f11d0..488382e53277c 100644 --- a/docs/html/sdk/installing.jd +++ b/docs/html/sdk/installing.jd @@ -54,7 +54,7 @@ function toggleDiv(link) {
    3. 1. Preparing Your Development Computer
    4. 2. Downloading the SDK Starter Package
    5. 3. Installing the ADT Plugin for Eclipse
      6. -
    6. 4. Adding Platforms and Other Components +
    7. 4. Adding Platforms and Other Components
      1. Available Components
      2. Recommended Components
        3. @@ -153,7 +153,7 @@ href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs.Step 4. Adding Android Platforms and Other Components +

        Step 4. Adding Platforms and Other Components

        The last step in setting up your SDK is using the Android SDK and AVD Manager (a tool included in the SDK starter package) to download diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd index 8ea70881e682e..bb0dde64357a5 100644 --- a/docs/html/sdk/win-usb.jd +++ b/docs/html/sdk/win-usb.jd @@ -179,7 +179,7 @@ development.

      3. Windows Vista:
        1. Perform a fresh installation
          2. -
        2. Upgrade an existing driver
          3. +
        3. Upgrade an existing driver
      4. Windows XP: