diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd index 2c255a9902b9d..272d027e8eed8 100644 --- a/docs/html/guide/appendix/api-levels.jd +++ b/docs/html/guide/appendix/api-levels.jd @@ -6,7 +6,7 @@ page.title=Android API Levels

In this document

    -
  1. What is API Level?
    2. +
  2. What is API Level?
  3. Uses of API Level in Android
  4. Development Considerations
      diff --git a/docs/html/guide/samples/images/BluetoothChat1.png b/docs/html/guide/samples/images/BluetoothChat1.png deleted file mode 100644 index f87da6a952b16..0000000000000 Binary files a/docs/html/guide/samples/images/BluetoothChat1.png and /dev/null differ diff --git a/docs/html/guide/samples/images/BluetoothChat2.png b/docs/html/guide/samples/images/BluetoothChat2.png deleted file mode 100644 index 6218eff5ffea7..0000000000000 Binary files a/docs/html/guide/samples/images/BluetoothChat2.png and /dev/null differ diff --git a/docs/html/guide/samples/images/ContactManager1.png b/docs/html/guide/samples/images/ContactManager1.png deleted file mode 100644 index 78f09d2ff0704..0000000000000 Binary files a/docs/html/guide/samples/images/ContactManager1.png and /dev/null differ diff --git a/docs/html/guide/samples/images/ContactManager2.png b/docs/html/guide/samples/images/ContactManager2.png deleted file mode 100644 index 34da37db063d5..0000000000000 Binary files a/docs/html/guide/samples/images/ContactManager2.png and /dev/null differ diff --git a/docs/html/guide/samples/images/MultiResolution.png b/docs/html/guide/samples/images/MultiResolution.png deleted file mode 100644 index 8b245d99532a2..0000000000000 Binary files a/docs/html/guide/samples/images/MultiResolution.png and /dev/null differ diff --git a/docs/html/guide/samples/images/Wiktionary.png b/docs/html/guide/samples/images/Wiktionary.png deleted file mode 100644 index eae5da5bdd106..0000000000000 Binary files a/docs/html/guide/samples/images/Wiktionary.png and /dev/null differ diff --git a/docs/html/guide/samples/images/WiktionarySimple.png b/docs/html/guide/samples/images/WiktionarySimple.png deleted file mode 100644 index a23226b8b02ea..0000000000000 Binary files a/docs/html/guide/samples/images/WiktionarySimple.png and /dev/null differ diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd index 28f3d0895884b..fc437e920a16d 100644 --- a/docs/html/guide/samples/index.jd +++ b/docs/html/guide/samples/index.jd @@ -31,56 +31,57 @@ platforms) and allow you to view the source files in your browser.

      Some of the samples in this listing are not yet available in the SDK. While we work to update the SDK, you can - download the latest samples as a ZIP - file here.

      + download the latest samples as a ZIP + archive.

      -
      API Demos
      +
      API Demos
      A variety of small applications that demonstrate an extensive collection of framework topics.
      -
      Bluetooth Chat
      +
      Bluetooth Chat
      An application for two-way text messaging over Bluetooth.
      -
      Contact Manager
      -
      An application that demonstrates how to query the system contacts provider, as - well as insert contacts into a specific account.

      +
      Contact Manager
      +
      An application that demonstrates how to query the system contacts provider + using the ContactsContract API, as + well as insert contacts into a specific account.
      -
      Home
      +
      Home
      A home screen replacement application.
      -
      JetBoy
      +
      JetBoy
      JetBoy is a game that demonstrates the SONiVOX JET interactive music technology, with {@link android.media.JetPlayer}.
      -
      Lunar Lander
      +
      Lunar Lander
      A classic Lunar Lander game.
      -
      Multiple Resolutions
      +
      Multiple Resolutions
      A sample application that shows how to use resource directory qualifiers to provide different resources for different screen configurations.
      -
      Note Pad
      +
      Note Pad
      An application for saving notes. Similar (but not identical) to the - Notepad tutorial.
      + Notepad tutorial. -
      Searchable Dictionary
      +
      Searchable Dictionary
      A sample application that demonstrates Android's search framework, including how to provide search suggestions for Quick Search Box.
      -
      Snake
      +
      Snake
      An implementation of the classic game "Snake."
      -
      Soft Keyboard
      +
      Soft Keyboard
      An example of writing an input method for a software keyboard.
      -
      Wiktionary
      +
      Wiktionary
      An example of creating interactive widgets for display on the Android home screen.
      -
      Wiktionary (Simplified)
      +
      Wiktionary (Simplified)
      A simple Android home screen widgets example.
      diff --git a/docs/html/guide/topics/intents/intents-filters.jd b/docs/html/guide/topics/intents/intents-filters.jd index 7a7eb70e4e851..110721d0fa421 100644 --- a/docs/html/guide/topics/intents/intents-filters.jd +++ b/docs/html/guide/topics/intents/intents-filters.jd @@ -968,7 +968,7 @@ NoteEditor activity:
      Asks the activity to display the content of the note identified by {@code ID}. (For details on how {@code content:} URIs specify individual members of a group, see -Content Providers.) +Content Providers.)
      action: android.intent.action.EDIT
      data: content://com.google.provider.NotePad/notes/ID
      diff --git a/docs/html/resources/articles/backward-compatibility.jd b/docs/html/resources/articles/backward-compatibility.jd index 9f0ddf5b4ab84..e7f0b6004e26b 100644 --- a/docs/html/resources/articles/backward-compatibility.jd +++ b/docs/html/resources/articles/backward-compatibility.jd @@ -234,5 +234,5 @@ to do this easily by creating "Android Virtual Devices" with different API levels. Once you create the AVDs, you can test your application with old and new versions of the system, perhaps running them side-by-side to see the differences. More information about emulator AVDs can be found in the AVD documentation and +href="{@docRoot}guide/developing/tools/avd.html">in the AVD documentation and from emulator -help-virtual-device.

      \ No newline at end of file diff --git a/docs/html/resources/articles/images/contacts-2.png b/docs/html/resources/articles/images/contacts-2.png new file mode 100644 index 0000000000000..02f28aaad211c Binary files /dev/null and b/docs/html/resources/articles/images/contacts-2.png differ diff --git a/docs/html/resources/articles/layout-tricks-stubs.jd b/docs/html/resources/articles/layout-tricks-stubs.jd index e494a5461bbeb..88e4b25d22b95 100644 --- a/docs/html/resources/articles/layout-tricks-stubs.jd +++ b/docs/html/resources/articles/layout-tricks-stubs.jd @@ -2,7 +2,7 @@ page.title=Layout Tricks: Using ViewStubs @jd:body

      Sharing and reusing UI components is very easy with Android, thanks to the <include /> tag. Sometimes it's so +href="layout-tricks-reuse.html"><include /> tag. Sometimes it's so easy to create complex UI constructs that your UI ends up with a large number of views, some of which are rarely used. Thankfully, Android offers a very special widget called {@link android.view.ViewStub}, which brings you all the benefits diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index 60d044aeb54cd..54602bfab1a6a 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -157,6 +157,11 @@ +

      diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd index 7fbbea19372af..f5550734649cf 100644 --- a/docs/html/resources/samples/index.jd +++ b/docs/html/resources/samples/index.jd @@ -28,15 +28,29 @@ android update project -s -n API Demos -t <target_ID> -p <pat

      The pages below provide an overview of each sample application (available with most platforms) and allow you to view the source files in your browser.

      +
      +

      Some of the samples in this listing are not yet available in the + SDK. While we work to update the SDK, you can + download the latest samples as a ZIP + archive.

      +
      +
      API Demos
      A variety of small applications that demonstrate an extensive collection of framework topics.
      - + +
      Bluetooth Chat
      +
      An application for two-way text messaging over Bluetooth.
      + +
      Contact Manager
      +
      An application that demonstrates how to query the system contacts provider + using the ContactsContract API, as + well as insert contacts into a specific account.
      +
      Home
      -
      An application for saving notes. Similar (but not identical) to the - Notepad tutorial.
      +
      A home screen replacement application.
      JetBoy
      JetBoy is a game that demonstrates the SONiVOX JET interactive music technology, @@ -44,7 +58,11 @@ platforms) and allow you to view the source files in your browser.

      Lunar Lander
      A classic Lunar Lander game.
      - + +
      Multiple Resolutions
      +
      A sample application that shows how to use resource directory qualifiers to + provide different resources for different screen configurations.
      +
      Note Pad
      An application for saving notes. Similar (but not identical) to the Notepad tutorial.
      @@ -58,7 +76,13 @@ platforms) and allow you to view the source files in your browser.

      Soft Keyboard
      An example of writing an input method for a software keyboard.
      - + +
      Wiktionary
      +
      An example of creating interactive widgets for display on the Android + home screen.
      + +
      Wiktionary (Simplified)
      +
      A simple Android home screen widgets example.