From 6027501a7551231cf820c329f4c8343ffe278484 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Fri, 21 Jan 2011 18:36:07 -0800 Subject: [PATCH] update sidenav, fix typos Change-Id: I9da574db1ee13f511a5557f6ce4559192afc67b3 --- .../guide/topics/fundamentals/fragments.jd | 6 +-- docs/html/sdk/preview/start.jd | 46 +++++++++---------- docs/html/sdk/sdk_toc.cs | 11 ++--- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/docs/html/guide/topics/fundamentals/fragments.jd b/docs/html/guide/topics/fundamentals/fragments.jd index 09728059c27a5..9eceef1fac959 100644 --- a/docs/html/guide/topics/fundamentals/fragments.jd +++ b/docs/html/guide/topics/fundamentals/fragments.jd @@ -9,7 +9,7 @@ page.title=Fragments
  • Fragments decompose application functionality and UI into reusable modules
  • Add multiple fragments to a screen to avoid switching activities
  • Fragments have their own lifecycle, state, and back stack
    • -
  • Fragments require API Level HONEYCOMB or greater
    • +
  • Fragments require API Level "Honeycomb" or greater

    • In this document

    @@ -59,12 +59,12 @@ modular section of an activity, which has its own lifecycle, receives its own in which you can add or remove while the activity is running.

    A fragment must always be embedded in an activity and the fragment's lifecycle is directly -affected by the activity's lifecycle. For example, when the activity is paused, so are all +affected by the host activity's lifecycle. For example, when the activity is paused, so are all fragments in it, and when the activity is destroyed, so are all fragments. However, while an activity is running (it is in the resumed lifecycle state), you can manipulate each fragment independently, such as add or remove them. When you perform such a -fragment transaction, you can it to a back stack managed by the +fragment transaction, you can also add it to a back stack that's managed by the activity—each back stack entry in the activity is a record of the fragment transaction that occurred. The back stack allows the user to reverse a fragment transaction (navigate backwards), by pressing the BACK key.

    diff --git a/docs/html/sdk/preview/start.jd b/docs/html/sdk/preview/start.jd index be1e84b5b650e..ec01d0c4ae62b 100644 --- a/docs/html/sdk/preview/start.jd +++ b/docs/html/sdk/preview/start.jd @@ -3,10 +3,9 @@ page.title=Getting Started with the Android 3.0 Preview

    Welcome to Android 3.0!

    -

    Android 3.0 is the next major release of the Android platform and is optimized for tablet -devices. We're offering a preview SDK so you can get a head-start developing -applications for it or simply optimize your existing application for upcoming -tablets.

    +

    Android 3.0 is the next major release of the Android platform and is optimized for larger screen +devices, particularly tablets. We're offering a preview SDK so you can get a head-start developing +applications for it or simply test and optimize your existing application for upcoming devices.

    Be aware that: