donut snapshotandroid-sdk-tools_r2android-sdk-1.6-docs_r1

164 files changed, 3578 insertions, 9042 deletions

diff --git a/Android.mk b/Android.mk
index fd03c6d897dc..16d77e456f86 100644
--- a/Android.mk
+++ b/Android.mk
@@ -352,6 +352,8 @@ web_docs_sample_code_flags := \
 		            guide/samples/LunarLander "Lunar Lander" \
 		-samplecode $(sample_dir)/NotePad \
 		            guide/samples/NotePad "Note Pad" \
+		-samplecode $(sample_dir)/SearchableDictionary \
+		            guide/samples/SearchableDictionary "Searchable Dictionary" \
 		-samplecode $(sample_dir)/Snake \
 		            guide/samples/Snake "Snake" \
 		-samplecode $(sample_dir)/SoftKeyboard \
@@ -359,13 +361,13 @@ web_docs_sample_code_flags := \
 
 ## SDK version identifiers used in the published docs
   # major[.minor] version for current SDK. (full releases only)
-framework_docs_SDK_VERSION:=1.5
+framework_docs_SDK_VERSION:=1.6
   # release version (ie "Release x")  (full releases only)
-framework_docs_SDK_REL_ID:=3
+framework_docs_SDK_REL_ID:=1
   # name of current SDK directory (full releases only)
 framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)
   # flag to build offline docs for a preview release
-framework_docs_SDK_PREVIEW:=true
+framework_docs_SDK_PREVIEW:=0
 
 framework_docs_LOCAL_DROIDDOC_OPTIONS += \
 		-hdf sdk.version $(framework_docs_SDK_VERSION) \
diff --git a/api/4.xml b/api/4.xml
index 55d910508cca..fc54859f7369 100644
--- a/api/4.xml
+++ b/api/4.xml
@@ -4123,6 +4123,17 @@
  visibility="public"
 >
 </field>
+<field name="includeInGlobalSearch"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843374"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="indeterminate"
  type="int"
  transient="false"
@@ -6191,6 +6202,17 @@
  visibility="public"
 >
 </field>
+<field name="queryAfterZeroResults"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843394"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="radioButtonStyle"
  type="int"
  transient="false"
@@ -6686,6 +6708,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSettingsDescription"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843402"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="searchSuggestAuthority"
  type="int"
  transient="false"
@@ -6741,6 +6774,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSuggestThreshold"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843373"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="secondaryProgress"
  type="int"
  transient="false"
@@ -21158,6 +21202,17 @@
  visibility="public"
 >
 </field>
+<field name="INTENT_ACTION_WEB_SEARCH_SETTINGS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.search.action.WEB_SEARCH_SETTINGS&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="MENU_KEY"
  type="char"
  transient="false"
@@ -21191,6 +21246,17 @@
  visibility="public"
 >
 </field>
+<field name="SHORTCUT_MIME_TYPE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;vnd.android.cursor.item/vnd.android.search.suggest&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_COLUMN_FORMAT"
  type="java.lang.String"
  transient="false"
@@ -21279,6 +21345,28 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_COLUMN_SHORTCUT_ID"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;suggest_shortcut_id&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;suggest_spinner_while_refreshing&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_COLUMN_TEXT_1"
  type="java.lang.String"
  transient="false"
@@ -21312,6 +21400,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_NEVER_MAKE_SHORTCUT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;_-1&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_URI_PATH_QUERY"
  type="java.lang.String"
  transient="false"
@@ -21323,6 +21422,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_URI_PATH_SHORTCUT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;search_suggest_shortcut&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="USER_QUERY"
  type="java.lang.String"
  transient="false"
diff --git a/api/current.xml b/api/current.xml
index 55d910508cca..fc54859f7369 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -4123,6 +4123,17 @@
  visibility="public"
 >
 </field>
+<field name="includeInGlobalSearch"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843374"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="indeterminate"
  type="int"
  transient="false"
@@ -6191,6 +6202,17 @@
  visibility="public"
 >
 </field>
+<field name="queryAfterZeroResults"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843394"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="radioButtonStyle"
  type="int"
  transient="false"
@@ -6686,6 +6708,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSettingsDescription"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843402"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="searchSuggestAuthority"
  type="int"
  transient="false"
@@ -6741,6 +6774,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSuggestThreshold"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843373"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="secondaryProgress"
  type="int"
  transient="false"
@@ -21158,6 +21202,17 @@
  visibility="public"
 >
 </field>
+<field name="INTENT_ACTION_WEB_SEARCH_SETTINGS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.search.action.WEB_SEARCH_SETTINGS&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="MENU_KEY"
  type="char"
  transient="false"
@@ -21191,6 +21246,17 @@
  visibility="public"
 >
 </field>
+<field name="SHORTCUT_MIME_TYPE"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;vnd.android.cursor.item/vnd.android.search.suggest&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_COLUMN_FORMAT"
  type="java.lang.String"
  transient="false"
@@ -21279,6 +21345,28 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_COLUMN_SHORTCUT_ID"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;suggest_shortcut_id&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;suggest_spinner_while_refreshing&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_COLUMN_TEXT_1"
  type="java.lang.String"
  transient="false"
@@ -21312,6 +21400,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_NEVER_MAKE_SHORTCUT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;_-1&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_URI_PATH_QUERY"
  type="java.lang.String"
  transient="false"
@@ -21323,6 +21422,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_URI_PATH_SHORTCUT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;search_suggest_shortcut&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="USER_QUERY"
  type="java.lang.String"
  transient="false"
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 62faadc83de1..2245562763cf 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -51,6 +51,8 @@ import java.util.List;
  * <li><a href="#HowSearchIsInvoked">How Search Is Invoked</a>
  * <li><a href="#ImplementingSearchForYourApp">Implementing Search for Your App</a>
  * <li><a href="#Suggestions">Search Suggestions</a>
+ * <li><a href="#ExposingSearchSuggestionsToQuickSearchBox">Exposing Search Suggestions to
+ * Quick Search Box</a></li>
  * <li><a href="#ActionKeys">Action Keys</a>
  * <li><a href="#SearchabilityMetadata">Searchability Metadata</a>
  * <li><a href="#PassingSearchContext">Passing Search Context</a>
@@ -246,6 +248,12 @@ import java.util.List;
  * <li>Summaries of possible results</li>
  * </ul>
  * 
+ * <p>Once an application is configured to provide search suggestions, those same suggestions can
+ * easily be made available to the system-wide Quick Search Box, providing faster access to its
+ * content from one central prominent place. See
+ * <a href="#ExposingSearchSuggestionsToQuickSearchBox">Exposing Search Suggestions to Quick Search
+ * Box</a> for more details.
+ * 
  * <p>The primary form of suggestions is known as <i>queried suggestions</i> and is based on query
  * text that the user has already typed.  This would generally be based on partial matches in
  * the available data.  In certain situations - for example, when no query text has been typed yet -
@@ -480,6 +488,26 @@ import java.util.List;
  *             {@link android.content.Intent#ACTION_SEARCH ACTION_SEARCH}, optional otherwise.</td>
  *     </tr>
  *
+ *     <tr><th>{@link #SUGGEST_COLUMN_SHORTCUT_ID}</th>
+ *         <td>This column is used to indicate whether a search suggestion should be stored as a
+ *             shortcut, and whether it should be validated.  Shortcuts are usually formed when the
+ *             user clicks a suggestion from Quick Search Box.  If missing, the result will be
+ *             stored as a shortcut and never refreshed.  If set to
+ *             {@link #SUGGEST_NEVER_MAKE_SHORTCUT}, the result will not be stored as a shortcut.
+ *             Otherwise, the shortcut id will be used to check back for for an up to date
+ *             suggestion using {@link #SUGGEST_URI_PATH_SHORTCUT}. Read more about shortcut
+ *             refreshing in the section about
+ *             <a href="#ExposingSearchSuggestionsToQuickSearchBox">exposing search suggestions to
+ *             Quick Search Box</a>.</td>
+ *         <td align="center">No.  Only applicable to sources included in Quick Search Box.</td>
+ *     </tr>
+ *
+ *     <tr><th>{@link #SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING}</th>
+ *         <td>This column is used to specify that a spinner should be shown in lieu of an icon2
+ *             while the shortcut of this suggestion is being refreshed in Quick Search Box.</td>
+ *         <td align="center">No.  Only applicable to sources included in Quick Search Box.</td>
+ *     </tr>
+ * 
  *     <tr><th><i>Other Columns</i></th>
  *         <td>Finally, if you have defined any <a href="#ActionKeys">Action Keys</a> and you wish 
  *             for them to have suggestion-specific definitions, you'll need to define one 
@@ -553,6 +581,68 @@ import java.util.List;
  * query text is provided and the SUGGEST_COLUMN_INTENT_DATA values are not suitable for user 
  * inspection and editing.</li></ul>
  *
+ * <a name="ExposingSearchSuggestionsToQuickSearchBox"></a>
+ * <h3>Exposing Search Suggestions to Quick Search Box</h3>
+ * 
+ * <p>Once your application is set up to provide search suggestions, making them available to the
+ * globally accessable Quick Search Box is as easy as setting android:includeInGlobalSearch to
+ * "true" in your searchable metadata file.  Beyond that, here are some more details of how
+ * suggestions interact with Quick Search Box, and optional ways that you may customize suggestions
+ * for your application.
+ * 
+ * <p><b>Important Note:</b>  By default, your application will not be enabled as a suggestion
+ * provider (or "searchable item") in Quick Search Box. Once your app is installed, the user must
+ * enable it as a "searchable item" in the Search settings in order to receive your app's
+ * suggestions in Quick Search Box. You should consider how to message this to users of your app -
+ * perhaps with a note to the user the first time they launch the app about how to enable search
+ * suggestions. This gives your app a chance to be queried for suggestions as the user types into
+ * Quick Search Box, though exactly how or if your suggestions will be surfaced is decided by Quick
+ * Search Box.
+ *
+ * <p><b>Source Ranking:</b>  Once your application's search results are made available to Quick
+ * Search Box, how they surface to the user for a particular query will be determined as appropriate
+ * by Quick Search Box ranking. This may depend on how many other apps have results for that query,
+ * and how often the user has clicked on your results compared to the other apps - but there is no
+ * guarantee about how ranking will occur, or whether your app's suggestions will show at all for
+ * a given query.  In general, you can expect that providing quality results will increase the
+ * likelihood that your app's suggestions are provided in a prominent position, and apps that
+ * provide lower quality suggestions will be more likely to be ranked lower and/or not displayed.
+ *
+ * <p><b>Search Settings:</b>  Each app that is available to Quick Search Box has an entry in the
+ * system settings where the user can enable or disable the inclusion of its results.  Below the
+ * name of the application, each application may provide a brief description of what kind of
+ * information will be made available via a search settings description string pointed to by the
+ * android:searchSettingsDescription attribute in the searchable metadata. Note that the
+ * user will need to visit this settings menu to enable search suggestions for your app before your
+ * app will have a chance to provide search suggestions to Quick Search Box - see the section
+ * called "Important Note" above.
+ *
+ * <p><b>Shortcuts:</b>  Suggestions that are clicked on by the user may be automatically made into
+ * shortcuts, which are suggestions that have been copied from your provider in order to be quickly
+ * displayed without the need to re-query the original sources. Shortcutted suggestions may be
+ * displayed for the query that yielded the suggestion and for any prefixes of that query. You can
+ * request how to have your app's suggestions made into shortcuts, and whether they should be
+ * refreshed, using the {@link #SUGGEST_COLUMN_SHORTCUT_ID} column:
+ * <ul><li>Suggestions that do not include a shortcut id column will be made into shortcuts and
+ * never refreshed.  This makes sense for suggestions that refer to data that will never be changed
+ * or removed.</li>
+ * <li>Suggestions that include a shortcut id will be re-queried for a fresh version of the
+ * suggestion each time the shortcut is displayed.  The shortcut will be quickly displayed with
+ * whatever data was most recently available until the refresh query returns, after which the
+ * suggestion will be dynamically refreshed with the up to date information.  The shortcut refresh
+ * query will be sent to your suggestion provider with a uri of {@link #SUGGEST_URI_PATH_SHORTCUT}.
+ * The result should contain one suggestion using the same columns as the suggestion query, or be
+ * empty, indicating that the shortcut is no longer valid.  Shortcut ids make sense when referring
+ * to data that may change over time, such as a contact's presence status.  If a suggestion refers
+ * to data that could take longer to refresh, such as a network based refresh of a stock quote, you
+ * may include {@link #SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING} to show a progress spinner for the
+ * right hand icon until the refresh is complete.</li>
+ * <li>Finally, to prevent a suggestion from being copied into a shortcut, you may provide a
+ * shortcut id with a value of {@link #SUGGEST_NEVER_MAKE_SHORTCUT}.</li></ul>
+ * 
+ * Note that Quick Search Box will ultimately decide whether to shortcut your app's suggestions,
+ * considering these values as a strong request from your application.
+ * 
  * <a name="ActionKeys"></a>
  * <h3>Action Keys</h3>
  * 
@@ -725,7 +815,12 @@ import java.util.List;
  *                         and editing.</td>
  *                 </tr>
  *                 </tbody>
- *            </table></td>
+ *            </table>
+ *            Note that the icon of your app will likely be shown alongside any badge you specify,
+ *            to differentiate search in your app from Quick Search Box. The display of this icon
+ *            is not under the app's control.
+ *         </td>
+ *            
  *         <td align="center">No</td>
  *     </tr>
  *     
@@ -869,6 +964,47 @@ import java.util.List;
  *     </tbody>
  * </table>
  *
+ * <p>Elements of search metadata that configure search suggestions being available to Quick Search
+ * Box:
+ * <table border="2" width="85%" align="center" frame="hsides" rules="rows">
+ *
+ *     <thead>
+ *     <tr><th>Attribute</th> <th>Description</th> <th>Required?</th></tr>
+ *     </thead>
+ *
+ *     <tr><th>android:includeInGlobalSearch</th>
+ *         <td>If true, indicates the search suggestions provided by your application should be
+ *             included in the globally accessible Quick Search Box.  The attributes below are only
+ *             applicable if this is set to true.</td>
+ *         <td align="center">Yes</td>
+ *     </tr>
+ *
+ *     <tr><th>android:searchSettingsDescription</th>
+ *         <td>If provided, provides a brief description of the search suggestions that are provided
+ *             by your application to Quick Search Box, and will be displayed in the search settings
+ *             entry for your application.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *
+ *     <tr><th>android:queryAfterZeroResults</th>
+ *         <td>Indicates whether a source should be invoked for supersets of queries it has
+ *             returned zero results for in the past.  For example, if a source returned zero
+ *             results for "bo", it would be ignored for "bob".  If set to false, this source
+ *             will only be ignored for a single session; the next time the search dialog is
+ *             invoked, all sources will be queried.  The default value is false.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *
+ *     <tr><th>android:searchSuggestThreshold</th>
+ *         <td>Indicates the minimum number of characters needed to trigger a source from Quick
+ *             Search Box.  Only guarantees that a source will not be queried for anything shorter
+ *             than the threshold.  The default value is 0.</td>
+ *         <td align="center">No</td>
+ *     </tr>
+ *
+ *     </tbody>
+ * </table>
+ *
  * <p><b>Additional metadata for search action keys.</b>  For each action key that you would like to
  * define, you'll need to add an additional element defining that key, and using the attributes
  * discussed in <a href="#ActionKeys">Action Keys</a>.  A simple example is shown here:
@@ -1246,16 +1382,12 @@ public class SearchManager
      * result indicates the shortcut refers to a no longer valid sugggestion.
      *
      * @see #SUGGEST_COLUMN_SHORTCUT_ID
-     *
-     * @hide pending enabling of global search for third parties
      */
     public final static String SUGGEST_URI_PATH_SHORTCUT = "search_suggest_shortcut";
     
     /**
      * MIME type for shortcut validation.  You'll use this in your suggestions content provider
      * in the getType() function.
-     *
-     * @hide pending enabling of global search for third parties
      */
     public final static String SHORTCUT_MIME_TYPE = 
             "vnd.android.cursor.item/vnd.android.search.suggest";
@@ -1268,7 +1400,7 @@ public class SearchManager
      * In addition to the columns below, the suggestion columns are used to pass along the full
      * suggestion so it can be shortcutted.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_AUTHORITY =
             "com.android.globalsearch.stats";
@@ -1276,21 +1408,21 @@ public class SearchManager
     /**
      * The path the write goes to.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_URI_PATH = "click";
 
     /**
      * The column storing the query for the click.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_COLUMN_QUERY = "query";
 
     /**
      * The column storing the component name of the application that was pivoted into.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SEARCH_CLICK_REPORT_COLUMN_COMPONENT = "component";
 
@@ -1375,7 +1507,7 @@ public class SearchManager
      *  {@link #COMPONENT_NAME_KEY}. For use by the global search system only - if other providers
      *  attempt to use this column, the value will be overwritten by global search.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide
      */
     public final static String SUGGEST_COLUMN_INTENT_COMPONENT_NAME = "suggest_intent_component";
     /**
@@ -1400,8 +1532,6 @@ public class SearchManager
      * {@link #SUGGEST_NEVER_MAKE_SHORTCUT}, the result will not be stored as a shortcut.
      * Otherwise, the shortcut id will be used to check back for an up to date suggestion using
      * {@link #SUGGEST_URI_PATH_SHORTCUT}.
-     *
-     * @hide pending reenabling of global search for third parties
      */
     public final static String SUGGEST_COLUMN_SHORTCUT_ID = "suggest_shortcut_id";
 
@@ -1410,7 +1540,7 @@ public class SearchManager
      * cursor item's background color if it needs a non-default background color. A non-zero value
      * indicates a valid background color to override the default.
      *
-     * @hide an implementation detail not part of the public api
+     * @hide For internal use, not part of the public API.
      */
     public final static String SUGGEST_COLUMN_BACKGROUND_COLOR = "suggest_background_color";
     
@@ -1418,8 +1548,6 @@ public class SearchManager
      * Column name for suggestions cursor. <i>Optional.</i> This column is used to specify
      * that a spinner should be shown in lieu of an icon2 while the shortcut of this suggestion
      * is being refreshed.
-     *
-     * @hide pending reenabling of global search for third parties
      */
     public final static String SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING =
             "suggest_spinner_while_refreshing";
@@ -1427,8 +1555,6 @@ public class SearchManager
     /**
      * Column value for suggestion column {@link #SUGGEST_COLUMN_SHORTCUT_ID} when a suggestion
      * should not be stored as a shortcut in global search.
-     *
-     * @hide pending reenabling of global search for third parties
      */
     public final static String SUGGEST_NEVER_MAKE_SHORTCUT = "_-1";
 
@@ -1475,8 +1601,6 @@ public class SearchManager
      * Intent action for starting a web search provider's settings activity.
      * Web search providers should handle this intent if they have provider-specific
      * settings to implement.
-     *
-     * @hide implementation detail only relevent to web search providers
      */
     public final static String INTENT_ACTION_WEB_SEARCH_SETTINGS
             = "android.search.action.WEB_SEARCH_SETTINGS";
@@ -1491,7 +1615,8 @@ public class SearchManager
     
     /**
      * Intent action broadcasted to inform that the search settings have changed in some way.
-     * Either searchables have been enabled or disabled.
+     * Either searchables have been enabled or disabled, or a different web search provider
+     * has been chosen.
      */
     public final static String INTENT_ACTION_SEARCH_SETTINGS_CHANGED
             = "android.search.action.SETTINGS_CHANGED";
@@ -1500,7 +1625,7 @@ public class SearchManager
      * If a suggestion has this value in {@link #SUGGEST_COLUMN_INTENT_ACTION},
      * the search dialog will take no action.
      *
-     * @hide an implentation detail not part of the public api
+     * @hide
      */
     public final static String INTENT_ACTION_NONE = "android.search.action.ZILCH";
     
diff --git a/core/java/android/server/search/Searchables.java b/core/java/android/server/search/Searchables.java
index a2add73dc3b0..c61595736723 100644
--- a/core/java/android/server/search/Searchables.java
+++ b/core/java/android/server/search/Searchables.java
@@ -26,7 +26,6 @@ import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.pm.ApplicationInfo;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -231,16 +230,14 @@ public class Searchables {
                         : webSearchInfoList.get(ii - search_count);
                 ActivityInfo ai = info.activityInfo;
                 // Check first to avoid duplicate entries.
-                if (newSearchablesMap.containsKey(new ComponentName(ai.packageName, ai.name))) {
-                    continue;
-                }
-                SearchableInfo searchable = SearchableInfo.getActivityMetaData(mContext, ai);
-                if (searchable != null) {
-                    newSearchablesList.add(searchable);
-                    newSearchablesMap.put(searchable.getSearchActivity(), searchable);
-                    if (searchable.shouldIncludeInGlobalSearch()
-                            && isWhitelistedForGlobalSearch(pm, searchable.getSearchActivity())) {
-                        newSearchablesInGlobalSearchList.add(searchable);
+                if (newSearchablesMap.get(new ComponentName(ai.packageName, ai.name)) == null) {
+                    SearchableInfo searchable = SearchableInfo.getActivityMetaData(mContext, ai);
+                    if (searchable != null) {
+                        newSearchablesList.add(searchable);
+                        newSearchablesMap.put(searchable.getSearchActivity(), searchable);
+                        if (searchable.shouldIncludeInGlobalSearch()) {
+                            newSearchablesInGlobalSearchList.add(searchable);
+                        }
                     }
                 }
             }
@@ -292,25 +289,6 @@ public class Searchables {
     }
 
     /**
-     * Determines whether an activity may be included in quick search box.  For now this is
-     * restricted to system installed apps.
-     *
-     * TODO: remove when we are ready to enable global search for third party applications.
-     *
-     * @param pm The package manager.
-     * @param searchActivity The component of the search activity.
-     * @return True if the search activity may include its search suggestions in quick search box.
-     */
-    private boolean isWhitelistedForGlobalSearch(PackageManager pm, ComponentName searchActivity) {
-        try {
-            ActivityInfo ai = pm.getActivityInfo(searchActivity, 0);
-            return ((ai.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-
-    /**
      * Checks if the given activity component is present in the system and if so makes it the
      * preferred activity for handling ACTION_WEB_SEARCH.
      * @param component Name of the component to check and set as preferred.
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java
index 29dc2ea5246e..a92800d011ee 100644
--- a/core/java/android/text/Layout.java
+++ b/core/java/android/text/Layout.java
@@ -1527,7 +1527,7 @@ public abstract class Layout {
                     if (bm != null) {
                         workPaint.set(paint);
                         Styled.measureText(paint, workPaint, text,
-                                           offset, offset + 1, null);
+                                           j, j + 2, null);
 
                         float wid = (float) bm.getWidth() *
                                     -workPaint.ascent() / bm.getHeight();
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index d5f8dcb76bcb..fd78f83698aa 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2866,16 +2866,16 @@
             when the user clicks a suggestion.  <i>Optional attribute.</i> -->
         <attr name="searchSuggestIntentData" format="string" />
 
-        <!-- @hide If provided, this is the minimum number of characters needed to trigger
+        <!-- If provided, this is the minimum number of characters needed to trigger
              search suggestions. The default value is 0. <i>Optional attribute.</i> -->
         <attr name="searchSuggestThreshold" format="integer" />
 
-        <!-- @hide If provided and <code>true</code>, this searchable activity will be
+        <!-- If provided and <code>true</code>, this searchable activity will be
              included in any global lists of search targets.
-             The default value is <code>false</code>. <i>Optional attribute.</i>.-->
+             The default value is <code>false</code>. <i>Optional attribute.</i>. -->
         <attr name="includeInGlobalSearch" format="boolean" />
 
-        <!-- @hide If provided and <code>true</code>, this searchable activity will be invoked for all
+        <!-- If provided and <code>true</code>, this searchable activity will be invoked for all
              queries in a particular session. If set to <code>false</code> and the activity
              returned zero results for a query, it will not be invoked again in that session for
              supersets of that zero-results query. For example, if the activity returned zero
@@ -2883,7 +2883,7 @@
              The default value is <code>false</code>. <i>Optional attribute.</i>. -->
         <attr name="queryAfterZeroResults" format="boolean" />
         
-        <!-- @hide If provided, this string will be used to describe the searchable item in the
+        <!-- If provided, this string will be used to describe the searchable item in the
              searchable items settings within system search settings. <i>Optional
              attribute.</i> -->
         <attr name="searchSettingsDescription" format="string" />
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index d7224131f6a1..c92cf5185279 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1094,9 +1094,7 @@
   <public type="attr" name="tension" id="0x0101026a" />
   <public type="attr" name="extraTension" id="0x0101026b" />
   <public type="attr" name="anyDensity" id="0x0101026c" />
-  <!-- {@hide} -->
   <public type="attr" name="searchSuggestThreshold" id="0x0101026d" />
-  <!-- {@hide} -->
   <public type="attr" name="includeInGlobalSearch" id="0x0101026e" />
   <public type="attr" name="onClick" id="0x0101026f" />
   <public type="attr" name="targetSdkVersion" id="0x01010270" />
@@ -1117,7 +1115,6 @@
   <public type="attr" name="backupAgent" id="0x0101027f" />
   <public type="attr" name="allowBackup" id="0x01010280" />
   <public type="attr" name="glEsVersion" id="0x01010281" />
-  <!-- {@hide} -->
   <public type="attr" name="queryAfterZeroResults" id="0x01010282" />
   <public type="attr" name="dropDownHeight" id="0x01010283" />
   <public type="attr" name="smallScreens" id="0x01010284" />
@@ -1126,7 +1123,6 @@
   <public type="attr" name="progressBarStyleInverse" id="0x01010287" />
   <public type="attr" name="progressBarStyleSmallInverse" id="0x01010288" />
   <public type="attr" name="progressBarStyleLargeInverse" id="0x01010289" />
-  <!-- {@hide} -->
   <public type="attr" name="searchSettingsDescription" id="0x0101028a" />
   <public type="attr" name="textColorPrimaryInverseDisableOnly" id="0x0101028b" />
   <public type="attr" name="autoUrlDetect" id="0x0101028c" />
diff --git a/docs/html/community/index.jd b/docs/html/community/index.jd
index eb5887a23e58..3e69de4e57c0 100644
--- a/docs/html/community/index.jd
+++ b/docs/html/community/index.jd
@@ -3,8 +3,8 @@ page.title=Community
 @jd:body
 
 	<div id="mainBodyFluid">
-			<h1>Community</h1>
-			<p>Welcome to the Android developers community! We're glad you're here and invite you to participate in these discussions. Before posting, please read the <a href="http://source.android.com/discuss/android-discussion-groups-charter">Groups Charter</a> that covers the community guidelines.</p>
+<h1>Community</h1>
+<p>Welcome to the Android developers community! We're glad you're here and invite you to participate in these discussions. Before posting, please read the <a href="http://source.android.com/discuss/android-discussion-groups-charter">Groups Charter</a> that covers the community guidelines.</p>
 
 <p class="note"><strong>Note:</strong> If you are seeking discussion about Android source code (not application development),
 then please refer to the <a href="http://source.android.com/discuss">Open Source Project Mailing lists</a>.</p>
@@ -53,48 +53,42 @@ phrasing your questions, read <a href="http://www.catb.org/%7Eesr/faqs/smart-que
 <li><b>Android beginners</b> - You're new to Android application development. You want to figure out how to get started with the Android SDK and the basic Android APIs? Start here. This list is open to any discussion around beginner-type questions for developers using the SDK; this is a great way to get up and running with your new application on the Android platform. Ask about getting your development environment set up, get help with the first steps of Android development (your first User Interface, your first permission, your first file on the Android filesystem, your first app on the Android Market...). Be sure to check the archives first before asking new questions. Please avoid advanced subjects, which belong on android-developers, and user questions, which will get a better reception on android-discuss.
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-beginners">android-beginners</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-beginners-subscribe@googlegroups.com">android-beginners-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
-</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-beginners-subscribe@googlegroups.com">android-beginners-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android developers</b> - You're now an experienced Android application developer. You've grasped the basics of Android app development, you're comfortable using the SDK, now you want to move to advanced topics. Get help here with troubleshooting applications, advice on implementation, and strategies for improving your application's performance and user experience. This is the not the right place to discuss user issues (use android-discuss for that) or beginner questions with the Android SDK (use android-beginners for that).
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-developers">android-developers</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-developers-subscribe@googlegroups.com">android-developers-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
-</a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-developers-subscribe@googlegroups.com">android-developers-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android discuss</b> - The "water cooler" of Android discussion. You can discuss just about anything Android-related here, ideas for the Android platform, announcements about your applications, discussions about Android devices, community resources... As long as your discussion is related to Android, it's on-topic here. However, if you have a discussion here that could belong on another list, you are probably not reaching all of your target audience here and may want to consider shifting to a more targeted list.
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-discuss">android-discuss</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-discuss-subscribe@googlegroups.com">android-discuss-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
-    </a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-discuss-subscribe@googlegroups.com">android-discuss-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android ndk</b> - A place for discussing the Android NDK and topics related to using native code in Android applications. 
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-ndk">android-ndk</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-ndk-subscribe@googlegroups.com">android-ndk-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
-    </a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-ndk-subscribe@googlegroups.com">android-ndk-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android security discuss</b> - A place for open discussion on secure development, emerging security concerns, and best practices for and by android developers. Please don't disclose vulnerabilities directly on this list, you'd be putting all Android users at risk.
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-security-discuss">android-security-discuss</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-security-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com">
-    </a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-security-discuss@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android security announce</b> - A low-volume group for security-related announcements by the Android Security Team.
 <ul>
 <li>Subscribe using Google Groups:&nbsp;<a href="http://groups.google.com/group/android-security-announce">android-security-announce</a></li>
-<li>Subscribe via email:&nbsp;<a href="mailto:android-security-announce-subscribe@googlegroups.com">android-security-announce-subscribe@googlegroups.com</a>
-<a href="mailto:android-platform-subscribe@googlegroups.com">    </a></li>
+<li>Subscribe via email:&nbsp;<a href="mailto:android-security-announce-subscribe@googlegroups.com">android-security-announce-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index 8fc899bb4cc2..a4dcc5e0c76c 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -1,81 +1,323 @@
 page.title=Android API Levels
 @jd:body
 
+<div id="qv-wrapper">
+<div id="qv">
 
-<p>The Android <em>API Level</em> is an integer that indicates a set of APIs available in an Android SDK
-and on a version of the Android platform. Each version of the Android platform supports a specific set
-of APIs, which are always backward-compatible. For example, Android 1.5 supports all APIs available in
-Android 1.0, but the reverse is not true. If an application uses APIs
-available in Android 1.5 that are not available in 1.0, then the application should never be installed
-on an Android 1.0 device, because it will fail due to missing APIs. The API Level ensures this does not happen
-by comparing the minimum API Level required by the applicaiton to the API Level available on the device.</p>
-
-<p>When a new version of Android adds APIs, a new API Level is added to the platform. The new APIs
-are available only to applications that declare a minimum API Level that is equal-to or greater-than 
-the API Level in which the APIs were introduced. The API Level required by an application is declared with the
-<code>&lt;uses-sdk></code> element inside the Android manifest, like this:</p>
-
-<pre>&lt;uses-sdk android:minSdkVersion="3" /></pre>
-
-<p>The value for <code>minSdkVersion</code> is the minimum API Level required by the application.
-If this is not declared, then it is assumed that the application is compatible with all versions and defaults to 
-API Level 1. In which case, if the application actually uses APIs introduced with an API Level greater than 1, then
-the application will fail in unpredictable ways when installed on a device that only supports API Level 1 
-(such as an Android 1.0 device).  
-See the <code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk></a></code> 
-documentation for more about declaring the API Level in your manifest.</p>
-
-<p>For example, the {@link android.appwidget} package was introduced with API Level 3. If your application
-has set <code>minSdkVersion</code> to 1 or 2, then your application cannot use this package, 
-even if the device running your application uses a version of Android that supports it.
-In order to use the {@link android.appwidget} package, your application must set <code>minSdkVersion</code> 
-to 3 or higher. When the <code>minSdkVersion</code> is set to 3, the application will no longer be able to install 
-on a device running a platform version with an API Level less than 3.</p>
-
-<p>Despite the name of the manifest attribute (<code>minSdkVersion</code>), the API Level is not directly 
-associated with a specific SDK. For example, the SDK for Android 1.0 uses
-API Level 1 and the SDK for Android 1.1 uses API Level 2. So it may seem that the API Level increases consistently.
-However, it's possible that a subsequent platform
-releases will not introduce new APIs, and thus, the API Level will remain the same. In addition, there are often
-multiple SDK releases for a single platform version (there were three SDK releases for Android 1.5), and
-there's no guarantee that the API Level will remain the same between these. It's possible (but unlikely) that
-a second or third SDK for a given version of the platform will provide new APIs and add a new API Level.
-When you install a new SDK, be sure to read the SDK Contents on the install page, which specifies the API 
-Level for each platform available in the SDK. Also see the comparison of 
-<a href="#VersionsVsApiLevels">Platform Versions vs. API Levels</a>, below.</p>
-
-<p class="note"><strong>Note:</strong> During an "Early Look" SDK release, the APIs may not be final, so the
-API Level number cannot be specified. In this case, a string value matching the
-platform codename must be used as the value for <code>minSdkVersion</code>. This codename value
-will only be valid while using the Early Look SDK with the emulator. An application using this API Level
-can never be installed on an Android device. When the final SDK is released, you must update your manifest to use
-the official API Level integer.</p>
-
-<h2 id="VersionsVsApiLevels">Platform Versions vs. API Levels</h2>
-
-<p>The following table specifies the <em>maximum</em> API Level supported by each version of the Android platform.
-(Every platform is backward-compatible to API Level 1.)</p>
+  <h2>In this document</h2>
+<ol>
+  <li><a href="intro">What is API Level?</a></li>
+  <li><a href="#uses">Uses of API Level</a></li>
+  <li><a href="#considerations">Development Considerations</a>
+    <ol>
+      <li><a href="#fc">Application forward compatibility</a></li>
+      <li><a href="#bc">Application backward compatibility</a></li>
+      <li><a href="#platform">Selecting a platform version for compiling</a></li>
+      <li><a href="#apilevel">Declaring a minimum API Level</a></li>
+      <li><a href="#testing">Testing against higher API Levels</a></li>
+    </ol>
+  </li>
+  <li><a href="#filtering">Filtering the documentation</a></li>
+</ol>
+
+  <h2>See also</h2>
+  <ol>
+    <li><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a> manifest element</li>
+  </ol>
+
+</div>
+</div>
+
+<p>As you develop your application on Android, it's useful to understand the
+platform's general approach to API change management. It's also important to
+understand the API Level identifier and the role it plays in ensuring your 
+application's compatibility with devices on which it may be installed. </p>
+
+<p>The sections below provide information about API Level and how it affects
+your applications. </p>
+
+<p>For information about how to use the "Filter by API Level" control
+available in the API reference documentation, see 
+<a href="#filtering">Filtering the documentation</a> at the 
+end of this document. </p>
+
+<h2 id="intro">What is API Level?</h2>
+
+<p>API Level is an integer value that uniquely identifies the framework API
+revision offered by a version of the Android platform.</p>
+
+<p>The Android platform provides a framework API that applications can use to
+interact with the underlying Android system. The framework API consists of:</p>
+
+<ul>
+<li>A core set of packages and classes</li>
+<li>A set of XML elements and attributes for declaring a manifest file</li>
+<li>A set of XML elements and attributes for declaring and accessing resources</li>
+<li>A set of Intents</li>
+<li>A set of permissions that applications can request, as well as permission
+enforcements included in the system</li>
+</ul>
+
+<p>Each successive version of the Android platform can include updates to the
+Android application framework API that it delivers. </p>
+
+<p>Updates to the framework API are designed so that the new API remains
+compatible with earlier versions of the API. That is, most changes in the API
+are additive and introduce new or replacement functionality. As parts of the API
+are upgraded, the older replaced parts are deprecated but are not removed, so
+that existing applications can still use them. In a very small number of cases,
+parts of the API may be modified or removed, although typically such changes are
+only needed to ensure API robustness and application or system security. All
+other API parts from earlier revisions are carried forward without
+modification.</p>
+
+<p>The framework API that an Android platform delivers is specified using an
+integer identifier called "API Level". Each Android platform version supports
+exactly one API Level, although support is implicit for all earlier API Levels
+(down to API Level 1). The initial release of the Android platform provided 
+API Level 1 and subsequent releases have incremented the API Level.</p>
+
+<p>The following table specifies the API Level supported by each version of the
+Android platform.</p>
 
 <table>
   <tr><th>Platform Version</th><th>API Level</th></tr>
-  <tr><td>Android 1.0</td><td>1</td></tr>
-  <tr><td>Android 1.1</td><td>2</td></tr>
+  <tr><td>Android 1.6</td><td>4</td></tr>
   <tr><td>Android 1.5</td><td>3</td></tr>
-  <tr><td>Android Donut</td><td>Donut</td></tr>
+  <tr><td>Android 1.1</td><td>2</td></tr>
+  <tr><td>Android 1.0</td><td>1</td></tr>
 </table>
 
 
-<h2 id="ViewingTheApiReference">Viewing the API Reference Based on API Level</h2>
+<h2 id="uses">Uses of API Level in Android</h2>
+
+<p>The API Level identifier serves a key role in ensuring the best possible
+experience for users and application developers: 
+
+<ul>
+<li>It lets the Android platform describe the maximum framework API revision 
+that it supports</li>
+<li>It lets applications describe the framework API revision that they
+require</li>
+<li>It lets the system negotiate the installation of applications on the user's
+device, such that version-incompatible applications are not installed on a
+user's device</li>
+</ul>
+
+<p>Each Android platform version stores its API Level identifier internally, in
+the Android system itself. </p>
+
+<p>Applications can use a manifest element provided by the framework API &mdash;
+<code>&lt;uses-sdk&gt;</code> &mdash; to describe the minimum and maximum API
+Levels under which they are able to run, as well as the preferred API Level that
+they are designed to support. The element offers two key attributes:</p>
+
+<ul>
+<li><code>android:minSdkVersion</code> &mdash; Specifies the minimum API Level
+on which the application is able to run. The default value is "1".</li>
+<li><code>android:maxSdkVersion</code> &mdash; Specifies the maximum API Level
+on which the application is able to run.</li>
+</ul>
+
+<p>For example, to specify the minimum system API Level that an application
+requires in order to run, the application would include in its manifest a
+<code>&lt;uses-sdk&gt;</code> element with a <code>android:minSdkVersion</code>
+attribute. The value of <code>android:minSdkVersion</code> would be the integer
+corresponding to the API Level of the earliest version of the Android platform
+under which the application can run. </p>
+
+<p>When the user attempts to install an application, the Android system first
+checks the <code>&lt;uses-sdk&gt;</code> attributes in the application's
+manifest and compares them against its own internal API Level. The system
+allows the installation to begin only if these conditions are met:</p>
+
+<ul>
+<li>If a <code>android:minSdkVersion</code> attribute is declared, its value
+must be less than or equal to the system's API Level integer. If not declared,
+the system assumes that the application requires API Level 1. </li>
+<li>If a <code>android:maxSdkVersion</code> attribute is declared, its value
+must be equal to or greater than the system's API Level integer. 
+in the system itself. If not declared, the system assumes that the application
+has no maximum API Level. </li>
+</ul>
+
+<p>When declared in an application's manifest, a <code>&lt;uses-sdk&gt;</code>
+element might look like this: </p>
+
+<pre>&lt;manifest&gt;
+  ...
+  &lt;uses-sdk android:minSdkVersion="4" /&gt;
+  ...
+&lt;/manifest&gt;</pre>
+
+<p>The principal reason that an application would declare an API Level in
+<code>android:minSdkVersion</code> is to tell the Android system that it is
+using APIs that were <em>introduced</em> in the API Level specified. If the
+application were to be somehow installed on a platform with a lower API Level,
+then it would crash at run-time when it tries to access APIs that don't exist.
+The system prevents such an outcome by not allowing the application to be
+installed if the lowest API Level it requires is higher than that of the
+platform version on the target device.</p>
+
+<p>For example, the {@link android.appwidget} package was introduced with API
+Level 3. If an application uses that API, it must declare a
+<code>android:minSdkVersion</code> attribute with a value of "3". The
+application will then be installable on platforms such as Android 1.5 (API Level
+3) and Android 1.6 (API Level 4), but not on the Android 1.1 (API Level 2) and
+Android 1.0 platforms (API Level 1).</p>
+
+<p>For more information about how to specify an application's API Level
+requirements, see the <a
+href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code>&lt;uses-sdk&gt;</code></a>
+ section of the manifest file documentation.</p>
+
+
+<h2 id="considerations">Development Considerations</h2>
+
+<p>The sections below provide information related to API level that you should
+consider when developing your application.</p>
+
+<h3 id="fc">Application forward compatibility</h3>
+
+<p>Android applications are generally forward-compatible with new versions of
+the Android platform.</p>
+
+<p>Because almost all changes to the framework API are additive, an Android
+application developed using any given version of the API (as specified by its
+API Level) is forward-compatible with later versions of the Android platform and
+higher API levels. The application should be able to run on all later versions
+of the Android platform, except in isolated cases where the application uses a
+part of the API that is later removed for some reason. </p>
+
+<p>Forward compatibility is important because many Android-powered devices
+receive over-the-air (OTA) system updates. The user may install your
+application and use it successfully, then later receive an OTA update to a new
+version of the Android platform. Once the update is installed, your application
+will run in a new run-time version of the environment, but one that has the API
+and system capabilities that it depends on. </p>
+
+<p>In some cases, changes <em>below</em> the API, such those in the underlying
+system itself, may affect your application when it is run in the new
+environment. For that reason it's important for you, as the application
+developer, to understand how the application will look and behave in each system
+environment. To help you test your application on various versions of the Android
+platform, the Android SDK includes multiple platforms that you can download.
+Each platform includes a compatible system image that you can run in an AVD, to
+test your application. </p>
+
+<h3 id="bc">Application backward compatibility</h3>
+
+<p>Android applications are not necessarily backward compatible with versions of
+the Android platform older than the version against which they were compiled.
+</p>
+
+<p>Each new version of the Android platform can include new framework APIs, such
+as those that give applications access to new platform capabilities or replace
+existing API parts. The new APIs are accessible to applications when running on
+the new platform and, as mentioned above, also when running on later versions of
+the platform, as specified by API Level. Conversely, because earlier versions of
+the platform do not include the new APIs, applications that use the new APIs are
+unable to run on those platforms.</p>
+
+<p>Although it's unlikely that an Android-powered device would be downgraded to
+a previous version of the platform, it's important to realize that there are
+likely to be many devices in the field that run earlier versions of the
+platform. Even among devices that receive OTA updates, some might lag and not
+receive an update for a significant amount of time. </p>
+
+<h3 id="platform">Selecting a platform version and API Level</h3>
+
+<p>When you are developing your application, you will need to choose
+the platform version against which you will compile the application. In
+general, you should compile your application against the lowest possible
+version of the platform that your application can support. 
+
+<p>You can determine the lowest possible platform version by compiling the
+application against successively lower build targets. After you determine the
+lowest version, you should create an AVD using the corresponding platform
+version (and API Level) and fully test your application. Make sure to declare a
+<code>android:minSdkVersion</code> attribute in the application's manifest and
+set its value to the API Level of the platform version. </p>
+
+<h3 id="apilevel">Declaring a minimum API Level</h3>
+
+<p>If you build an application that uses APIs or system features introduced in
+the latest platform version, you should set the
+<code>android:minSdkVersion</code> attribute to the API Level of the latest
+platform version. This ensures that users will only be able to install your
+application if their devices are running a compatible version of the Android
+platform. In turn, this ensures that your application can function properly on
+their devices. </p>
+
+<p>If your application uses APIs introduced in the latest platform version but
+does <em>not</em> declare a <code>android:minSdkVersion</code> attribute, then
+it will run properly on devices running the latest version of the platform, but
+<em>not</em> on devices running earlier versions of the platform. In the latter
+case, the application will crash at runtime when it tries to use APIs that don't
+exist on the earlier versions.</p>
+
+<h3 id="testing">Testing against higher API Levels</h3>
+
+<p>After compiling your application, you should make sure to test it on the
+platform specified in the application's <code>android:minSdkVersion</code>
+attribute. To do so, create an AVD that uses the platform version required by
+your application. Additionally, to ensure forward-compatibility, you should run
+and test the application on all platforms that use a higher API Level than that
+used by your application. </p>
+
+<p>The Android SDK includes multiple platform versions that you can use,
+including the latest version, and provides an updater tool that you can use to
+download other platform versions as necessary. </p>
+
+<p>To access the updater, use the <code>android</code> command-line tool,
+located in the &lt;sdk&gt;/tools directory. You can launch the Updater by using
+the <code>android</code> command without specifying any options. You can
+also simply double-click the android.bat (Windows) or android (OS X/Linux) file.
+In ADT, you can also access the updater by selecting 
+<strong>Window</strong>&nbsp;>&nbsp;<strong>Android SDK and AVD
+Manager</strong>.</p>
+
+<p>To run your application against different platform versions in the emulator,
+create an AVD for each platform version that you want to test. For more
+information about AVDs, see <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>. If
+you are using a physical device for testing, ensure that you know the API Level
+of the Android platform it runs. See the table at the top of this document for
+a list of platform versions and their API Levels. </p>
+
+<!--
+The Framework API makeup: the API available in a specific platform version is
+made up of API parts introduced in previous versions, plus some parts that are
+new.
+-->
+
+<h2 id="filtering">Filtering the Reference Documentation by API Level</h2>
+
+<p>Reference documentation pages on the Android Developers site offer a "Filter
+by API Level" control in the top-right area of each page. </p>
 
-<p>The Android API reference includes information that specififies the minimum API Level required for each 
-package, class, and member. You can see this information on the right side of each header or label.</p>
+<p>The "Filter by API Level" lets you show documentation only for parts of the
+API that are actually accessible to your application, based on the API Level
+that it specifies in the <code>minSdkVersion</code> attribute in its manifest 
+file </p>
 
-<p>By default, the reference documentation shows all APIs available with the latest SDK release.
-This means that the reference assumes you're using the latest API Level and will show you everything available
-with it. If you're developing applications for a version of Android that does not support the latest API Level, 
-then you can filter the reference to reveal only the packages, classes, and members available for that API Level.
-When viewing the reference, use the "Filter by API Level" selection box (below the search box) to pick the API Level
-you'd like to view.</p>
+<p>When you filter the reference documentation by an API level, only the APIs
+available at that API level are shown. APIs introduced in a later API level are
+grayed out and their content is masked, since they would not be accessible to
+your application. </p>
 
+<p>Note that filtering by API Level in the documentation does not provide a view
+of what is new or introduced in each API Level. Filtering simply provides a way
+to view the entire API associated with a given API Level, while excluding API
+elements introduced in later API Levels.</p>
 
+<p>By default, API Level filtering is enabled and set to show the latest API
+Level. If you do not want to use filtering reference documentation, select the
+highest available API Level.</p>
 
+<p>Note that the reference documentation for API elements also specifies the API
+Level at which the element was introduced. The API Level for packages and
+classes is specified as "Since &lt;api level&gt;" at the top-right corner of the
+content area on each documentation page. The API Level for each class member is
+specified in the member's detailed description section header, at the right
+margin. </p>
diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd
index a5cf7358500c..c3ec2e552cc5 100644
--- a/docs/html/guide/developing/eclipse-adt.jd
+++ b/docs/html/guide/developing/eclipse-adt.jd
@@ -149,15 +149,15 @@ on running your applicaiton.</p>
 
 <h3 id="CreatingAnAvd">Creating an AVD</h3>
 
-<p>With ADT 0.9.2 and above, the Android AVD Manager provides a simple graphical interface
+<p>With ADT 0.9.3 and above, the Android SDK and AVD Manager provides a simple graphical interface
 for creating and managing AVDs. (If you're using ADT version 0.9.1 or older, you must 
 use the <code>android</code> tool to create your AVDs&mdash;read the AVD guide to
 <a href="{@docRoot}guide/developing/tools/avd.html#creating">Creating an AVD</a>.)
 
-<p>To create an AVD with the Android AVD Manager:</p>
+<p>To create an AVD with the AVD Manager:</p>
 
 <ol>
-  <li>Select <strong>Window > Android AVD Manager</strong>, or click the Android AVD Manager icon (a black device)
+  <li>Select <strong>Window > Android SDK and AVD Manager</strong>, or click the Android SDK and AVD Manager icon (a black device)
     in the Eclipse toolbar.</p>
   </li>
   <li>In the Virtual Devices panel, you'll see a list of existing AVDs. Click <strong>New</strong>
@@ -169,7 +169,7 @@ use the <code>android</code> tool to create your AVDs&mdash;read the AVD guide t
   <li>Click <strong>Create AVD</strong>.</li>
 </ol>
 
-<p>Your AVD is now ready and you can close the Android AVD Manager. 
+<p>Your AVD is now ready and you can close the AVD Manager. 
 In the next section, you'll see how the AVD is used
 when launching your application on an emulator.</p>
 
@@ -217,7 +217,7 @@ to start, the emulator options to use, and so on. When you first run a project
 as an <em>Android Application</em>, ADT will automatically create a run configuration.
 The default run configuration will
 launch the default project Activity and use automatic target mode for device selection 
-(with no preferred AVD). If the default setting don't suit your project, you can 
+(with no preferred AVD). If the default settings don't suit your project, you can 
 customize the launch configuration or even create a new.</p>
 
 <p>To create or modify a launch configuration, follow these steps as appropriate 
@@ -256,6 +256,12 @@ for your Eclipse version:</p>
     when selecting an AVD to run your application.
     See the following section on <a href=#AutoAndManualModes">Automatic and manual target 
     modes</a>).</p>
+    <p>You can specify any emulator options to the Additional Emulator Command
+    Line Options field. For example, you could add <code>-scale 96dpi</code> to
+    scale the AVD's screen to an accurate size, based on the dpi of your
+    computer monitor. For a full list of emulator options, see the <a
+    href="{@docRoot}guide/developing/tools/emulator.html">Android Emulator</a>
+document.</p>
   </li>
 </ol>
 
diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd
index 8cdf0b91d7b8..2080873eaf58 100644
--- a/docs/html/guide/developing/other-ide.jd
+++ b/docs/html/guide/developing/other-ide.jd
@@ -85,7 +85,8 @@ command to generate all the necessary files and folders.</p>
 navigate to the <code>tools/</code> directory of your SDK and run:</p>
 <pre>
 android create project \
---target <em>&lt;targetID&gt;</em> \
+--target <em>&lt;target_ID&gt;</em> \
+--name <em>&lt;your_project_name&gt;</em> \
 --path <em>/path/to/your/project</em> \
 --activity <em>&lt;your_activity_name&gt;</em> \
 --package <em>&lt;your_package_namespace&gt;</em>
@@ -96,11 +97,14 @@ android create project \
   to an Android platform library (including any add-ons, such as Google APIs) that you would like to
   build your project against. To see a list of available targets and their corresponding IDs, 
   execute: <code>android list targets</code>.</li>
+  <li><code>name</code> is the name for your project. This is optional. If provided, this name will be used
+  for your .apk filename when you build your application.</li>
   <li><code>path</code> is the location of your project directory. If the directory does not exist,
   it will be created for you.</li>
-  <li><code>activity</code> is the name for your {@link android.app.Activity} class. This class file
+  <li><code>activity</code> is the name for your default {@link android.app.Activity} class. This class file
   will be created for you inside 
-  <code><em>&lt;path_to_your_project&gt;</em>/src/<em>&lt;your_package_namespace_path&gt;</em>/</code>.</li>
+  <code><em>&lt;path_to_your_project&gt;</em>/src/<em>&lt;your_package_namespace_path&gt;</em>/</code>.
+  This will also be used for your .apk filename unless you provide a the <code>name</code>.</li>
   <li><code>package</code> is the package namespace for your project, following the same rules as for
   packages in the Java programming language.</li>
 </ul>
@@ -109,9 +113,10 @@ android create project \
 <pre>
 android create project \
 --target 1 \
---path ./myProject \
---activity MyActivity \
---package com.example.myproject
+--name MyAndroidApp \
+--path ./MyAndroidAppProject \
+--activity MyAndroidAppActivity \
+--package com.example.myandroid
 </pre>
 
 <p>The tool generates the following files and directories:</p>
@@ -123,7 +128,8 @@ android create project \
   <li><code>default.properties</code> - Properties for the build system. <em>Do not modify 
   this file</em>.</li>
   <li><code>build.properties</code> - Customizable properties for the build system. You can edit this 
-  file to overried default build settings used by Ant.</li>
+  file to override default build settings used by Ant and provide a pointer to your keystore and key alias
+  so that the build tools can sign your application when built in release mode.</li>
   <li><code>src<em>/your/package/namespace/ActivityName</em>.java</code> - The Activity class 
   you specified during project creation.</li>
   <li><code>bin/</code>  - Output directory for the build script.</li>
@@ -141,7 +147,7 @@ that you must use the <a href="{@docRoot}guide/developing/tools/adb.html">Androi
 to the emulator (discussed later). So you need access between your project solution and 
 the <code>tools/</code> folder.</p>
 
-<p class="warning"><strong>Note:</strong> You should refrain from moving the
+<p class="caution"><strong>Caution:</strong> You should refrain from moving the
 location of the SDK directory, because this will break the build scripts. (They
 will need to be manually updated to reflect the new SDK location before they will
 work again.)</p>
@@ -153,14 +159,15 @@ work again.)</p>
 a new project from existing code, use the
 <code>android update project</code> command to update the project to the new development
 environment. You can also use this command to revise the build target of an existing project
-(with the <code>--target</code> option). The <code>android</code> tool will generate any files and 
+(with the <code>--target</code> option) and the project name (with the <code>--name</code> 
+option). The <code>android</code> tool will generate any files and 
 folders (listed in the previous section) that are either missing or need to be updated, 
 as needed for the Android project.</p>
 
 <p>To update an existing Android project, open a command-line
 and navigate to the <code>tools/</code> directory of your SDK. Now run:</p>
 <pre>
-android update project --target <em>&lt;targetID&gt;</em> --path <em>path/to/your/project/</em>
+android update project --name <em>&lt;project_name&gt;</em> --target <em>&lt;target_ID&gt;</em> --path <em>path/to/your/project/</em>
 </pre>
 
 <ul>
@@ -169,11 +176,13 @@ android update project --target <em>&lt;targetID&gt;</em> --path <em>path/to/you
   like to build your project against. To see a list of available targets and their corresponding IDs, 
   execute: <code>android list targets</code>.</li>
   <li><code>path</code> is the location of your project directory.</li>
+  <li><code>name</code> is the name for the project. This is optional&mdash;if you're not 
+  changing the project name, you don't need this.</li>
 </ul>
 
 <p>Here's an example:</p>
 <pre>
-android update project --target 2 --path ./myProject
+android update project --name MyApp --target 2 --path ./MyAppProject
 </pre>
 
 
@@ -237,8 +246,9 @@ install JDK in a non-space directory, for example: <code>c:\java\jdk1.6.0_02</co
 <h3 id="DebugMode">Building in debug mode</h3>
 
 <p>For immediate application testing and debugging, you can build your application 
-in debug mode and immediately install it on an emulator. In debug mode, the build tools automatically
-sign your application with a debug key. However, you can (and should) also test your
+in debug mode and immediately install it on an emulator. In debug mode, the build tools 
+automatically sign your application with a debug key and optimize the package with 
+{@code zipalign}. However, you can (and should) also test your
 application in release mode. Debug mode simply allows you to run your application without
 manually signing the application.</p>
 
@@ -248,9 +258,9 @@ manually signing the application.</p>
   <li>Open a command-line and navigate to the root of your project directory.</li>
   <li>Use Ant to compile your project in debug mode:
     <pre>ant debug</pre>
-    <p>This creates your Android application .apk file inside the project <code>bin/</code>
-    directory, named <code><em>&lt;your_DefaultActivity_name&gt;</em>-debug.apk</code>. The file
-    is already signed with the debug key.</p>
+    <p>This creates your debug .apk file inside the project <code>bin/</code>
+    directory, named <code><em>&lt;your_project_name&gt;</em>-debug.apk</code>. The file
+    is already signed with the debug key and has been aligned with {@code zipalign}.</p>
   </li>
 </ol>
 
@@ -267,23 +277,86 @@ about <a href="#Running">Running Your Application</a>.</p>
 your application in release mode. Once you have built in release mode, it's a good idea to perform 
 additional testing and debugging with the final .apk.</p>
 
-<p>To build in release mode:</p>
+<p>Before you start building your application in release mode, be aware that you must sign
+the resulting application package with your private key, and should then align it using the
+{@code zipalign} tool. There are two approaches to building in release mode:
+build an unsigned package in release mode and then manually sign and align 
+the package, or allow the build script
+to sign and align the package for you.</p>
+
+<h4 id="ManualReleaseMode">Build unsigned</h4>
+
+<p>If you build your application <em>unsigned</em>, then you will need to
+manually sign and align the package.</p>
+
+<p>To build an <em>unsigned</em> .apk in release mode:</p>
 
 <ol>
   <li>Open a command-line and navigate to the root of your project directory.</li>
   <li>Use Ant to compile your project in release mode:
     <pre>ant release</pre>
-    <p>This creates your Android application .apk file inside the project <code>bin/</code>
-    directory, named <code><em>&lt;your_DefaultActivity_name&gt;</em>.apk</code>.</p>
-    <p class="note"><strong>Note:</strong> The .apk file is <em>unsigned</em> at this point.
-    You can't install it on an emulator or device until you sign it with your private key.</p>
   </li>
 </ol>
 
-<p>Because release mode builds your application unsigned, your next step is to sign
-it with your private key, in order to distribute it to end-users. To complete this procedure, 
+<p>This creates your Android application .apk file inside the project <code>bin/</code>
+directory, named <code><em>&lt;your_project_name&gt;</em>-unsigned.apk</code>.</p>
+    
+<p class="note"><strong>Note:</strong> The .apk file is <em>unsigned</em> at this point 
+and can't be installed until signed with your private key.</p>
+
+<p>Once you have created the unsigned .apk, your next step is to sign the .apk
+with your private key and then align it with {@code zipalign}. To complete this procedure, 
 read <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.</p>
 
+<p>When your .apk has been signed and aligned, it's ready to be distributed to end-users.</p>
+
+<h4 id="AutoReleaseMode">Build signed and aligned</h4>
+
+<p>If you would like, you can configure the Android build script to automatically
+sign and align your application package. To do so, you must provide the path to your keystore 
+and the name of your key alias in your project's {@code build.properties} file. With this
+information provided, the build script will prompt you for your keystore and alias password
+when you build in release mode and produce your final application package, which will be ready
+for distribution.</p>
+
+<p class="caution"><strong>Caution:</strong> Due to the way Ant handles input, the password that
+you enter during the build process <strong>will be visible</strong>. If you are
+concerned about your keystore and alias password being visible on screen, then you
+may prefer to perform the application signing manually, via Jarsigner (or a similar tool). To instead 
+perform the signing procedure manually, <a href="#ManualReleaseMode">buid unsigned</a> and then continue 
+with <a href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.</p>
+
+<p>To specify your keystore and alias, open the project {@code build.properties} file (found in the
+root of the project directory) and add entries for {@code key.store} and {@code key.alias}. 
+For example:</p>
+
+<pre>
+key.store=/path/to/my.keystore
+key.alias=mykeystore
+</pre>
+
+<p>Save your changes. Now you can build a <em>signed</em> .apk in release mode:</p>
+
+<ol>
+  <li>Open a command-line and navigate to the root of your project directory.</li>
+  <li>Use Ant to compile your project in release mode:
+    <pre>ant release</pre>
+  </li>
+  <li>When prompted, enter you keystore and alias passwords.
+    <p class="caution"><strong>Caution:</strong> As described above, 
+    your password will be visible on the screen.</p>
+  </li>
+</ol>
+
+<p>This creates your Android application .apk file inside the project <code>bin/</code>
+directory, named <code><em>&lt;your_project_name&gt;</em>-release.apk</code>.
+This .apk file has been signed with the private key specified in
+{@code build.properties} and aligned with {@code zipalign}. It's ready for 
+installation and distribution.</p>
+
+
+<h4>Once built and signed in release mode</h4>
+
 <p>Once you have signed your application with a private key, you can install it on an 
 emulator or device as discussed in the following section about 
 <a href="#Running">Running Your Application</a>.
@@ -329,7 +402,7 @@ id:2
         you'll use this in the next step.</p>
       </li>
       <li>Create a new AVD using your selected deployment target:
-        <pre>android create avd --name <em>&lt;your_avd_name&gt;</em> --target <em>&lt;targetID&gt;</em></pre>
+        <pre>android create avd --name <em>&lt;your_avd_name&gt;</em> --target <em>&lt;target_ID&gt;</em></pre>
       <li>Next, you'll be asked whether you'd like to create a custom hardware profile.
       If you respond "yes," you'll be presented with a series of prompts to define various aspects of the
       device hardware (leave entries blank to use default values, which are shown in brackets). Otherwise,
diff --git a/docs/html/guide/developing/tools/avd.jd b/docs/html/guide/developing/tools/avd.jd
index b8f205ec0f7e..06b1245c426d 100644
--- a/docs/html/guide/developing/tools/avd.jd
+++ b/docs/html/guide/developing/tools/avd.jd
@@ -11,6 +11,8 @@ page.title=Android Virtual Devices
         hardware options, system image, and data storage.
     <li>You create AVD configurations to model different device environments 
         in the Android emulator.</li>
+    <li>The <code>android</code> tool offers a graphical Android AVD 
+        Manager and a command-line interface for creating AVDs.</li>
   </ul>
   <h2>In this document</h2>
   <ol>
@@ -72,9 +74,18 @@ reference of emulator options, please see the <a
 href="{@docRoot}guide/developing/tools/emulator.html">Emulator</a>
 documentation. </p>
 
-<p>To create and manage AVDs, you use the android tool provided in the Android
-SDK. For more information about how to work with AVDs from inside
-your development environment, see <a
+<p>To create and manage AVDs, you use the <code>android</code> tool provided in
+the <code>tools/</code> directory of the Android SDK. The tool provides both a
+graphical AVD manager and a command-line interface that you can use to
+create AVDs. To access the graphical AVD manager, run the
+<code>android</code> tool without options. The sections below describe how to
+use the <code>android</code> command-line interface to create and manage AVDs.
+Note that some functionality, such as the capability to create an AVD with a
+custom hardware configuration, are only available through the command-line
+interface. </p>
+
+<p>For more information about how to work with AVDs from inside your development
+environment, see <a
 href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse with
 ADT</a> or <a href="{@docRoot}guide/developing/other-ide.html">Developing in
 Other IDEs</a>, as appropriate for your environment.</p>
@@ -89,11 +100,11 @@ you need to create an AVD before you can run any application in the emulator
 </div>
 </div>
 
-<p>To create an AVD, you use the android tool, a command-line utility
-available in the <code>&lt;sdk&gt;/tools/</code> directory. Managing AVDs is one
-of the two main function of the android tool (the other is creating and updating
-Android projects). Open a terminal window and change to the 
-<code>&lt;sdk&gt;/tools/</code> directory, if needed</p>
+<p>To create an AVD, you use the <code>android</code> tool, a command-line
+utility available in the <code>&lt;sdk&gt;/tools/</code> directory. Managing
+AVDs is one of the two main function of the <code>android</code> tool (the other
+is creating and updating Android projects). Open a terminal window and change to
+the <code>&lt;sdk&gt;/tools/</code> directory, if needed</p>
 
 <p>To create each AVD, you issue the command <code>android create avd</code>,
 with options that specify a name for the new AVD and the system image you want
@@ -118,11 +129,12 @@ version or that of any SDK add-on. Later, when applications use the AVD, they'll
 be running on the system that you specify in the <code>-t</code> argument.<p>
 
 <p>To specify the system image to use, you refer to its <em>target ID</em>
-&mdash; an integer &mdash; as assigned by the android tool. The target ID is not
-derived from the system image name, version, or API Level, or other attribute,
-so you need to have the android tool list the available system images and the
-target ID of each, as described in the next section. You should do this
-<em>before</em> you run the <code>android create avd</code> command.
+&mdash; an integer &mdash; as assigned by the <code>android</code> tool. The
+target ID is not derived from the system image name, version, or API Level, or
+other attribute, so you need to have the <code>android</code> tool list the
+available system images and the target ID of each, as described in the next
+section. You should do this <em>before</em> you run the <code>android create
+avd</code> command.
 </p>
 
 <h3 id="listingtargets">Listing targets</h3>
@@ -131,7 +143,7 @@ target ID of each, as described in the next section. You should do this
 
 <pre>android list targets</pre>
 
-<p>The android tool scans the <code>&lt;sdk&gt;/platforms</code> and
+<p>The <code>android</code> tool scans the <code>&lt;sdk&gt;/platforms</code> and
 <code>&lt;sdk&gt;/add-ons</code> directories looking for valid system images and
 then generates the list of targets. Here's an example of the command output:
 </p>
@@ -199,24 +211,22 @@ system image in the list above): </p>
 <pre>android create avd -n my_android1.5 -t 2</pre>
 
 <p>If the target you selected was a standard Android system image ("Type:
-platform"), the android tool next asks you whether you want to create a custom
-hardware profile. </p>
-
+platform"), the <code>android</code> tool next asks you whether you want to
+create a custom hardware profile. </p>
 <pre>Android 1.5 is a basic Android platform.
 Do you wish to create a custom hardware profile [no]</pre>
 
 <p>If you want to set custom hardware emulation options for the AVD, enter
 "yes" and set values as needed. If you want to use the default hardware
 emulation options for the AVD, just press the return key (the default is "no").
-The android tool creates the AVD with name and system image mapping you
+The <code>android</code> tool creates the AVD with name and system image mapping you
 requested, with the options you specified. 
 
-<p class="note">If you are creating an AVD whose target is an SDK add-on,
-the android tool does not allow you to set hardware emulation options. It
-assumes that the provider of the add-on has set emulation options appropriately
-for the device that the add-on is modeling, and so prevents you from resetting
-the options. </p>
-
+<p class="note">If you are creating an AVD whose target is an SDK add-on, the
+<code>android</code> tool does not allow you to set hardware emulation options.
+It assumes that the provider of the add-on has set emulation options
+appropriately for the device that the add-on is modeling, and so prevents you
+from resetting the options. </p>
 <p>For a list of options you can use in the <code>android create avd</code>
 command, see the table in <a href="#options">Command-line options for AVDs</a>,
 at the bottom of
@@ -225,11 +235,11 @@ this page. </p>
 <h3 id="hardwareopts">Setting hardware emulation options</h3>
 
 <p>When are creating a new AVD that uses a standard Android system image ("Type:
-platform"), the android tool lets you set hardware emulation options for virtual
-device. The table below lists the options available and the default values, as
-well as the names of properties that store the emulated hardware options in the AVD's
-configuration file (the config.ini file in the AVD's local directory). </p>
-
+platform"), the <code>android</code> tool lets you set hardware emulation
+options for virtual device. The table below lists the options available and the
+default values, as well as the names of properties that store the emulated
+hardware options in the AVD's configuration file (the config.ini file in the
+AVD's local directory). </p>
 
 <table>
 <tr>
@@ -249,7 +259,6 @@ configuration file (the config.ini file in the AVD's local directory). </p>
 <td>Whether there is a touch screen or not on the device. Default value is "yes".</td>
 <td>hw.touchScreen
 
-
 <tr>
 <td>Trackball support </td>
 <td>Whether there is a trackball on the device. Default value is "yes".</td>
@@ -339,23 +348,30 @@ configuration file (the config.ini file in the AVD's local directory). </p>
 <td>Default value is "66MB".</td>
 <td>disk.cachePartition.size </td>
 </tr>
+
+<tr>
+<td>Abstracted LCD density</td>
+<td>Sets the generalized density characteristic used by the AVD's screen. Default value is "160".</td>
+<td>hw.lcd.density </td>
+</tr>
+
 </table>
 
 <h3 id="location">Default location of the AVD files</h3>
 
-<p>When you create an AVD, the android tool creates a dedicated directory for it
+<p>When you create an AVD, the <code>android</code> tool creates a dedicated directory for it
 on your development computer. The directory contains the AVD configuration file,
 the user data image and SD card image (if available), and any other files
 associated with the device. Note that the directory does not contain a system
 image &mdash; instead, the AVD configuration file contains a mapping to the
 system image, which it loads when the AVD is launched. </p>
 
-<p>The android tool also creates a &lt;AVD name&gt;.ini file for the AVD at the
+<p>The <code>android</code> tool also creates a &lt;AVD name&gt;.ini file for the AVD at the
 root of the .android/avd directory on your computer. The file specifies the
 location of the AVD directory and always remains at the root the .android 
 directory.</p>
 
-<p>By default, the android tool creates the AVD directory inside
+<p>By default, the <code>android</code> tool creates the AVD directory inside
 <code>~/.android/avd/</code> (on Linux/Mac), <code>C:\Documents and
 Settings\&lt;user&gt;\.android\</code> on Windows XP, and 
 <code>C:\Users\&lt;user&gt;\.android\</code> on Windows Vista. 
@@ -396,18 +412,18 @@ Error: Invalid value in image.sysdir. Run 'android update avd -n foo' </pre>
 
 <h3 id="deleting">Deleting an AVD</h3>
 
-<p>You can use the android tool to delete an AVD. Here is the command usage:</p>
+<p>You can use the <code>android</code> tool to delete an AVD. Here is the command usage:</p>
 
 <pre>android delete avd -n &lt;name&gt; </pre>
 
-<p>When you issue the command, the android tool looks for an AVD matching the 
+<p>When you issue the command, the <code>android</code> tool looks for an AVD matching the 
 specified name deletes the AVD's directory and files. </p>
 
 
 <h2 id="options">Command-line options for AVDs</h2>
 
 <p>The table below lists the command-line options you can use with the 
-android tool. </p>
+<code>android</code> tool. </p>
 
 
 <table>
@@ -448,9 +464,9 @@ android tool. </p>
   <td><code>-f</code></td>
   <td>Force creation of the AVD</td>
   <td>By default, if the name of the AVD being created matches that of an 
-      existing AVD, the android tool will not create the new AVD or overwrite 
+      existing AVD, the <code>android</code> tool will not create the new AVD or overwrite 
       the existing AVD. If you specify the <code>-f</code> option, however, the 
-      android tool will automatically overwrite any existing AVD that has the 
+      <code>android</code> tool will automatically overwrite any existing AVD that has the 
       same name as the new AVD. The files and data of the existing AVD are 
       deleted. </td>
 </tr>
@@ -465,7 +481,7 @@ files.</td>
   <td><code>-s &lt;name&gt;</code> or <br>
       <code>-s &lt;width&gt;-&lt;height&gt;</code> </td>
   <td>The skin to use for this AVD, identified by name or dimensions.</td>
-  <td>The android tool scans for a matching skin by name or dimension in the
+  <td>The <code>android</code> tool scans for a matching skin by name or dimension in the
 <code>skins/</code> directory of the target referenced in the <code>-t
 &lt;targetID&gt;</code> argument. Example: <code>-s HVGA-L</code></td>
 </tr>
diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd
index 82d3c8dd6d0a..a9b6914cf476 100644
--- a/docs/html/guide/developing/tools/emulator.jd
+++ b/docs/html/guide/developing/tools/emulator.jd
@@ -1,7 +1,7 @@
 page.title=Android Emulator
 @jd:body
 
-<img src="{@docRoot}images/emulator-hvga-p.png" alt="Image of the Android Emulator" width="271" height="524" style="margin-left:0em;margin-top:-4em;float:right;"/>
+<div style="padding:1em;"><img src="/images/emulator-wvga800l.png" alt="Image of the Android Emulator" width="367" height="349" style="margin-left:2em;margin-top:-4em;float:right;"/></div>
 
 <p>The Android SDK includes a mobile device emulator -- a virtual mobile device 
 that runs on your computer. The emulator lets you prototype, develop, and test 
@@ -27,9 +27,13 @@ from which you can log kernel output, simulate application interrupts (such as
 arriving SMS messages or phone calls), and simulate latency effects and dropouts 
 on the data channel.</p>
 
-<div class="inline-toc" style="whitespace:nowrap;">
-<h4>In this document:</h4>
-<div class="g-unit g-first" style="whitespace:nowrap;width:35%;">
+<table>
+<tr>
+<td colspan="2" style="border:0;"><strong>In this document:</strong></td>
+</tr>
+<tr>
+<td style="border:0;">
+
 <ol class="toc">
 <li><a href="#overview">Overview</a></li>
 <li><a href="#starting">Starting and Stopping the Emulator</a></li>
@@ -53,9 +57,9 @@ on the data channel.</p>
 	<li><a href="#calling">Sending a Voice Call or SMS to Another Emulator Instance</a></li>
 	</ol></li>
 </ol>
-</div>
+</td>
 
-<div class="g-unit" style="whitespace:nowrap;">
+<td style="border:0;">
 <ol class="toc">
 <li><a href="#console">Using the Emulator Console</a>
 	<ol class="toc">
@@ -85,9 +89,9 @@ on the data channel.</p>
 <li><a href="#troubleshooting">Troubleshooting Emulator Problems</a></li>
 <li><a href="#limitations">Emulator Limitations</a></li>
 </ol>
-</div>
+</td>
 
-</div>
+</table>
 
 <a name="overview"></a>
 
@@ -260,11 +264,11 @@ the keys of your keyboard. </p>
   </tr>
   <tr>
     <td>Switch to previous layout orientation (for example, portrait, landscape)</td>
-    <td>KEYPAD_7, F11</td>
+    <td>KEYPAD_7, Ctrl-F11</td>
   </tr>
   <tr>
     <td>Switch to next layout orientation (for example, portrait, landscape)</td>
-    <td>KEYPAD_9, F12</td>
+    <td>KEYPAD_9, Ctrl-F12</td>
   </tr>
   <tr>
     <td>Toggle cell networking on/off</td>
@@ -721,19 +725,19 @@ scale in direct relationship with &lt;delay&gt; values.</p>
 </tr>
 <tr>
   <td><code>-skin &lt;skinID&gt;</code></td>
-  <td>Start the emulator with the specified skin. </td>
-  <td>The standard Android platforms includes a <a href="#skins">choice of 
-      four skins</a>:<br />
-      <li>HVGA-L (480x320, landscape)</li>
-      <li>HVGA-P (320x480, portrait) (default) </li>
-      <li>QVGA-L (320x240, landscape)</li>
-      <li>QVGA-P (240x320, portrait) </li>
+  <td>This emulator option is deprecated. </td>
+  <td>Please set skin options using AVDs, rather than by using this emulator
+option. Using this option may yield unexpected and in some cases misleading
+results, since the density with which to render the skin may not be defined.
+AVDs let you associate each skin with a default density and override the default
+as needed. For more information, see <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>.
 </td>
 </tr>
 <tr>
   <td><code>-skindir &lt;dir&gt;</code></td>
-  <td>Search for emulator skins in &lt;dir&gt;. </td>
-  <td>&nbsp;</td></tr>
+  <td>This emulator option is deprecated. </td>
+  <td>See comments for <code>-skin</code>, above.</td></tr>
 </table>
 
 <a name="diskimages"></a>
@@ -1636,41 +1640,9 @@ kilobits/sec):</p>
 
 <h2>Using Emulator Skins</h2>
 
-<p>You can run the emulator with any of four default skins, as described in the table below. To specify a skin, use <code>-skin &lt;skinID&gt;</code> when starting the emulator. </p>
-
-<p>For example: </p>
-
-<pre>emulator -skin HVGA-L</pre> 
+<p>The Android SDK includes several Emulator skins that you can use to control the resolution and density of the emulated device's screen. To select a specific skin for running the emulator, create an AVD that uses that skin. Please do not use deprecated emulator options such as <code>-skin</code> to control the skin used by an emulator instance. For more information about AVDs, see <a
+href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a>.  </p>
 
-<p>Note that you must enter the <code>&lt;skinID&gt;</code> in uppercase letters (if your development computer is case-sensitive).</p>
-
-<table border="0" style="clear:left;padding:2em;">
-  <tr>
-    <th width="20%">skinID</th>
-    <th >Description</th>
-    <th >Skin</th>
-  </tr>
-  <tr>
-    <td><code>HVGA-L</code></td>
-    <td>480x320, landscape</td>
-    <td><img src="{@docRoot}images/e-mini-hvga-l.png" width="219" height="113"></td>
-  </tr>
-  <tr>
-    <td><code>HVGA-P</code></td>
-    <td>320x480, portrait (default)</td>
-    <td><img src="{@docRoot}images/e-mini-hvga-p.png" width="113" height="219"></td>
-  </tr>
-  <tr>
-    <td><code>QVGA-L</code></td>
-    <td>320x240, landscape</td>
-    <td><img src="{@docRoot}images/e-mini-qvga-l.png" width="119" height="197"></td>
-  </tr>
-  <tr>
-    <td><code>QVGA-P</code></td>
-    <td>240x320, portrait</td>
-    <td><img src="{@docRoot}images/e-mini-qvga-p.png" width="95" height="173"></td>
-  </tr>
-</table>
 
 <a name="multipleinstances"></a>
 
diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd
index 2c9e45df3117..91b430ff771a 100644
--- a/docs/html/guide/developing/tools/index.jd
+++ b/docs/html/guide/developing/tools/index.jd
@@ -89,5 +89,10 @@ applications on the emulator. </p>
             <dd>A script that lets you manage AVDs and generate <a
                         href="http://ant.apache.org/" title="Ant">Ant</a> build files that 
                         you can use to compile your Android applications. </dd>
+                        
+  <dt><a  href="zipalign.html">zipalign</a></dt>
+            <dd>An important .apk optimization tool. This tool ensures that all uncompressed data starts
+            with a particular alignment relative to the start of the file. This should always be used
+            to align .apk files after they have been signed.</dd>
 </dl>
 
diff --git a/docs/html/guide/developing/tools/zipalign.jd b/docs/html/guide/developing/tools/zipalign.jd
new file mode 100644
index 000000000000..6231798408d0
--- /dev/null
+++ b/docs/html/guide/developing/tools/zipalign.jd
@@ -0,0 +1,65 @@
+page.title=zipalign
+@jd:body
+
+<p>zipalign is an archive alignment tool that provides important
+optimization to Android application (.apk) files. 
+The purpose is to ensure that all uncompressed data starts
+with a particular alignment relative to the start of the file.  Specifically,
+it causes all uncompressed data within the .apk, such as images or raw files,
+to be aligned on 4-byte boundaries. This
+allows all portions to be accessed directly with {@code mmap()} even if they
+contain binary data with alignment restrictions. 
+The benefit is a reduction in the amount of RAM consumed 
+when running the application.</p>
+
+<p>This tool should always be used to align your .apk file before 
+distributing it to end-users. The Android build tools can handle
+this for you. When using Eclipse with the ADT plugin, the Export Wizard
+will automatically zipalign your .apk after it signs it with your private key. 
+The build scripts used
+when compiling your application with Ant will also zipalign your .apk,
+as long as you have provided the path to your keystore and the key alias in
+your project {@code build.properties} file, so that the build tools 
+can sign the package first.</p>
+
+<p class="caution"><strong>Caution:</strong> zipalign must only be performed
+<strong>after</strong> the .apk file has been signed with your private key.
+If you perform zipalign before signing, then the signing procedure will undo
+the alignment. Also, do not make alterations to the aligned package.
+Alterations to the archive, such as renaming or deleting entries, will
+potentially disrupt the alignment of the modified entry and all later
+entries. And any files added to an "aligned" archive will not be aligned.</p>
+
+<p>The adjustment is made by altering the size of
+the "extra" field in the zip Local File Header sections.  Existing data
+in the "extra" fields may be altered by this process.</p>
+
+<p>For more information about how to use zipalign when building your 
+application, please read <a href="{@docRoot}guide/publishing/app-signing.html">Signing
+Your Application</a>.</p>
+
+
+<h3>Usage</h3>
+
+<p>To align {@code infile.apk} and save it as {@code outfile.apk}:</p>
+
+<pre>zipalign [-f] [-v] &lt;alignment> infile.apk outfile.apk</pre>
+
+<p>To confirm the alignment of {@code existing.apk}:</p>
+
+<pre>zipalign -c -v &lt;alignment> existing.apk</pre>
+
+<p>The {@code &lt;alignment>} is an integer that defines the byte-alignment boundaries. 
+This must always be 4 (which provides 32-bit alignment) or else it effectively 
+does nothing.</p>
+
+<p>Flags:</p>
+
+<ul>
+  <li>{@code -f} : overwrite existing outfile.zip</li>
+  <li>{@code -v} : verbose output</li>
+  <li>{@code -c} : confirm the alignment of the given file</li>
+</ul>
+
+
+
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 459ad37f79b6..5abc872c9646 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -256,6 +256,7 @@
       		<li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li>
       		<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
       		<li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html" >zipalign</a></li>
     	  </ul>
   	  </li>
   <!--<li><a href="<?cs var:toroot ?>guide/developing/instrumentation/index.html">Instrumentation</a></li>
@@ -375,7 +376,7 @@
     </ul>
     <ul>
     <?cs if:android.whichdoc != "online" ?>
-      <li><a href="<?cs var:toroot ?>../samples">
+      <li><a href="<?cs var:toroot ?>../platforms/android-<?cs var:sdk.version ?>/samples">
             <span class="en">Sample Code</span>
           &raquo;</a></li>
     <?cs else ?>
@@ -399,6 +400,9 @@
           <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">
                 <span class="en">Note Pad</span>
               </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/SearchableDictionary/index.html">
+                <span class="en">Searchable Dictionary</span>
+              </a></li>
           <li><a href="<?cs var:toroot ?>guide/samples/Snake/index.html">
                 <span class="en">Snake</span>
               </a></li>
diff --git a/docs/html/guide/publishing/app-signing.jd b/docs/html/guide/publishing/app-signing.jd
index a16c9106ad93..f0febc09785a 100644
--- a/docs/html/guide/publishing/app-signing.jd
+++ b/docs/html/guide/publishing/app-signing.jd
@@ -22,10 +22,11 @@ page.title=Signing Your Applications
 <li><a href="#debugmode">Signing in Debug Mode</a></li>
 <li><a href="#releasemode">Signing for Public Release</a>
     <ol>
-    <li><a href="#releasecompile">Compiling for release</a></li>
-    <li><a href="#cert">Obtaining a suitable private key</a></li>
-    <li><a href="#signapp">Signing your application</a></li>
-    <li><a href="#ExportWizard">Compiling and signing with Eclipse ADT</a></li>
+    <li><a href="#cert">Obtain a suitable private key</a></li>
+    <li><a href="#releasecompile">Compile the application in release mode</a></li>
+    <li><a href="#signapp">Sign your application with your private key</a></li>
+    <li><a href="#align">Align the final APK package</a></li>
+    <li><a href="#ExportWizard">Compile and sign with Eclipse ADT</a></li>
     </ol>
 </li>
 <li><a href="#secure-key">Securing Your Private Key</a></li>
@@ -71,6 +72,7 @@ application's signer certificate expires after the application is installed, the
 will continue to function normally.</li>
   <li>You can use standard tools &mdash; Keytool and Jarsigner &mdash; to generate keys and 
 sign your application .apk files.</li>
+  <li>Once you have signed the application, use the <code>zipalign</code> tool to optimize the final APK package.</li>
 </ul>
 
 <p>The Android system will not install or run an application that is not signed appropriately. This 
@@ -107,6 +109,9 @@ There are two ways to do this:
 </li>
 </ul>
 
+<p>Once your application is signed, don't forget to run {@code zipalign} on the APK
+for additional optimization.</p>
+
 <h2 id="strategies">Signing Strategies</h2>
 
 <p>Some aspects of application signing may affect how you approach the development
@@ -171,16 +176,16 @@ use a <a href="#cert">suitable certificate</a> to sign your applications. </p>
 
 <h2 id="setup">Basic Setup for Signing</h2>
 
-<p>To support the generation of a keystore and debug key, you should first make sure that 
+<p>Before you begin, you should make sure that 
 Keytool is available to the SDK build 
-tools. In most cases, you can tell the SDK build tools how to find Keytool by making sure 
-that your JAVA_HOME environment variable is set and that it references a suitable JDK. 
-Alternatively, you can add the JDK version of Keytool to your PATH variable.</p>
+tools. In most cases, you can tell the SDK build tools how to find Keytool by setting
+your <code>JAVA_HOME</code> environment variable to references a suitable JDK. 
+Alternatively, you can add the JDK version of Keytool to your <code>PATH</code> variable.</p>
 
 <p>If you are developing on a version of Linux that originally came with GNU Compiler for 
 Java, make sure that the system is using the JDK version of Keytool, rather than the gcj 
-version. If Keytool is already in your PATH, it might be pointing to a symlink at 
-<code>/usr/bin/keytool</code>. In this case, check the symlink target to make sure that it points 
+version. If Keytool is already in your <code>PATH</code>, it might be pointing to a symlink at 
+<code>/usr/bin/keytool</code>. In this case, check the symlink target to be sure it points 
 to the Keytool in the JDK.</p>
 
 <p>If you will release your application to the public, you will also need to have
@@ -191,46 +196,50 @@ in the JDK. </p>
 
 <p>The Android build tools provide a debug signing mode that makes it easier for you 
 to develop and debug your application, while still meeting the Android system
-requirement for signing your .apk when it is installed in the emulator or a device. 
-When you use debug mode, the SDK tools invoke Keytool to create a debug 
-keystore and key.</p>
+requirement for signing your .apk.
+When using debug mode to build your app, the SDK tools invoke Keytool to automatically create
+a debug keystore and key. This debug key is then used to automatically sign the .apk, so
+you do not need to sign the package with your own key.</p>
 
-<p>The SDK tools create the debug keystore/key with predetermined names/passwords;</p>
+<p>The SDK tools create the debug keystore/key with predetermined names/passwords:</p>
 <ul>
-<li>Keystore name &ndash; "debug.keystore"</li>
-<li>Keystore password &ndash; "android"</li>
-<li>Key alias &ndash; "androiddebugkey"</li>
-<li>Key password &ndash; "android"</li>
-<li>CN &ndash; "CN=Android Debug,O=Android,C=US"</li>
+<li>Keystore name: "debug.keystore"</li>
+<li>Keystore password: "android"</li>
+<li>Key alias: "androiddebugkey"</li>
+<li>Key password: "android"</li>
+<li>CN: "CN=Android Debug,O=Android,C=US"</li>
 </ul></p>
 
 <p>If necessary, you can change the location/name of the debug keystore/key or
-supply a custom debug keystore/key to use. In Eclipse/ADT, you can use
-<strong>Windows</strong> &gt; <strong>Prefs</strong> &gt;
-<strong>Android</strong> &gt; <strong>Build</strong>. However, any custom debug
+supply a custom debug keystore/key to use. However, any custom debug
 keystore/key must use the same keystore/key names and passwords as the default
-debug key (as described above).</p>
+debug key (as described above). (To do so in Eclipse/ADT, go to
+<strong>Windows</strong> &gt; <strong>Preferences</strong> &gt;
+<strong>Android</strong> &gt; <strong>Build</strong>.) </p>
 
-<p class="note"><strong>Note:</strong> You <em>cannot</em> release your application 
+<p class="caution"><strong>Caution:</strong> You <em>cannot</em> release your application 
 to the public when signed with the debug certificate.</p>
 
 <h3>Eclipse Users</h3>
 
-<p>If you are developing in Eclipse/ADT and have set up Keytool as described
-above, signing in debug mode is enabled by default. When you run or debug your
-application, ADT signs the .apk with the debug certificate and installs it on 
-the emulator. No specific action on your part is needed, provided ADT has 
-access to Keytool.</p>
+<p>If you are developing in Eclipse/ADT (and have set up Keytool as described above in 
+<a href="#setup">Basic Setup for Signing</a>),
+signing in debug mode is enabled by default. When you run or debug your
+application, ADT signs the .apk with the debug certificate, runs {@code zipalign} on the 
+package, then installs it on 
+the selected emulator or connected device. No specific action on your part is needed, 
+provided ADT has access to Keytool.</p>
 
 <h3>Ant Users</h3>
 
-<p>If you use Ant to build your .apk files, debug signing mode 
-is enabled by using the <code>debug</code> option, assuming that you are using a 
-<code>build.xml</code> file generated by the 
-<code>android</code> tool. When you run <code>ant debug</code> to 
+<p>If you are using Ant to build your .apk files, debug signing mode 
+is enabled by using the <code>debug</code> option with the <code>ant</code> command
+(assuming that you are using a <code>build.xml</code> file generated by the
+<code>android</code> tool). When you run <code>ant debug</code> to 
 compile your app, the build script generates a keystore/key and signs the .apk for you. 
+The script then also aligns the .apk with the <code>zipalign</code> tool.
 No other action on your part is needed. Read 
-<a href="{@docRoot}guide/developing/other-ide.html#DebugMode">Developing In Other IDEs: Building 
+<a href="{@docRoot}guide/developing/other-ide.html#DebugMode">Developing In Other IDEs: Building
 in debug mode</a> for more information.</p>
 
 
@@ -268,51 +277,20 @@ certificate</a>. </p>
 
 <p>When your application is ready for release to other users, you must:</p>
 <ol>
-  <li>Compile the application in release mode</li>
-  <li>Obtain a suitable private key</li>
-  <li>Sign the application with your private key</li>
+  <li><a href="#cert">Obtain a suitable private key</a></li>
+  <li><a href="#releasecompile">Compile the application in release mode</li>
+  <li><a href="#signapp">Sign your application with your private key</a></li>
+  <li><a href="#align">Align the final APK package</a></li>
 </ol>
 
-<p>The sections below provide information about how to perform these steps.</p>
-
-<p>If you use Eclipse with the ADT plugin, you can instead use the Export Wizard
-to compile and sign an .apk with your private key. The Export Wizard even allows you to 
-generate a new keystore and private key in the process. Skip to
-<a href="#ExportWizard">Compiling and signing with Eclipse ADT</a>.</p>
-
-
-<h3 id="releasecompile">Compiling for release</h3>
-
-<p>To prepare your application for release, you must first compile it in release mode. 
-In release mode, the Android build tools compile your application as usual, 
-but without signing it with the debug key.</p>
-
-<p class="warning"><strong>Note:</strong>
-You can not release your application unsigned, or signed with the debug key.</p>
+<p>If you are developing in Eclipse with the ADT plugin, you can use the Export Wizard
+to perform the compile, sign, and align procedures. The Export Wizard even allows you to 
+generate a new keystore and private key in the process. So if you use Eclipse, you can 
+skip to <a href="#ExportWizard">Compile and sign with Eclipse ADT</a>.</p>
 
-<h4>Eclipse users</h4>
 
-<p>To export an <em>unsigned</em> .apk from Eclipse, right-click the project in the Package 
-Explorer and select <strong>Android Tools</strong> > <strong>Export Unsigned Application 
-Package</strong>. Then simply specify the file location for the unsigned .apk.
-(Alternatively, open your <code>AndroidManifest.xml</code> file in Eclipse, open 
-the <em>Overview</em> tab, and click <strong>Export an unsigned .apk</strong>.)</p>
-
-<p>You can also combine the compiling and signing steps with the Export Wizard. See 
-<a href="#ExportWizard">Compiling and signing with Eclipse ADT</a>.</p>
 
-<h4>Ant users</h4>
-
-<p>If you are using Ant, all you need to do is specify the build target 
-"release" in the Ant command. For example, if you are running Ant from the 
-directory containing your build.xml file, the command would look like this:</p>
-
-<pre>$ ant release</pre>
-
-<p>The build script compiles the application .apk without signing it.</p>
-
-
-<h3 id="cert">Obtaining a Suitable Private Key</h3>
+<h3 id="cert">1. Obtain a suitable private key</h3>
 
 <p>In preparation for signing your application, you must first ensure that 
 you have a suitable private key with which to sign. A suitable private 
@@ -339,7 +317,8 @@ in <a href="#setup">Basic Setup</a>.</p>
 command and pass any of the options listed below (and any others, as
 needed). </p>
 
-<p class="warning"><strong>Note:</strong> Before you run Keytool, make sure to read 
+<p class="warning"><strong>Warning:</strong> Keep your private key secure. 
+Before you run Keytool, make sure to read 
 <a href="#secure-key">Securing Your Private Key</a> for a discussion of how to keep
 your key secure and why doing so is critically important to you and to users. In
 particular, when you are generating your key, you should select strong passwords
@@ -395,7 +374,6 @@ way, your password is not stored in your shell history.</p></td>
 </tr>
 </table>
 
-
 <p>Here's an example of a Keytool command that generates a private key:</p>
 
 <pre>$ keytool -genkey -v -keystore my-release-key.keystore 
@@ -415,9 +393,57 @@ href="http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security">
 http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
 
 
-<h3 id="signapp">Signing your application</h3>
 
-<p>When you are ready to actually sign your .apk for release, you can do so
+<h3 id="releasecompile">2. Compile the application in release mode</h3>
+
+<p>In order to release your application to users, you must compile it in release mode. 
+In release mode, the compiled application is not signed by default and you will need
+to sign it with your private key.</p>
+
+<p class="caution"><strong>Caution:</strong>
+You can not release your application unsigned, or signed with the debug key.</p>
+
+<h4>With Eclipse</h4>
+
+<p>To export an <em>unsigned</em> .apk from Eclipse, right-click the project in the Package 
+Explorer and select <strong>Android Tools</strong> > <strong>Export Unsigned Application 
+Package</strong>. Then specify the file location for the unsigned .apk.
+(Alternatively, open your <code>AndroidManifest.xml</code> file in Eclipse, open 
+the <em>Overview</em> tab, and click <strong>Export an unsigned .apk</strong>.)</p>
+
+<p>Note that you can combine the compiling and signing steps with the Export Wizard. See 
+<a href="#ExportWizard">Compiling and signing with Eclipse ADT</a>.</p>
+
+<h4>With Ant</h4>
+
+<p>If you are using Ant, you can enable release mode by using the <code>release</code> option
+with the <code>ant</code> command. For example, if you are running Ant from the 
+directory containing your {@code build.xml} file, the command would look like this:</p>
+
+<pre>ant release</pre>
+
+<p>By default, the build script compiles the application .apk without signing it. The output file
+in your project {@code bin/} will be <code><em>&lt;your_project_name></em>-unsigned.apk</code>.
+Because the application .apk is still unsigned, you must manually sign it with your private
+key and then align it using {@code zipalign}.</p>
+
+<p>However, the Ant build script can also perform the signing
+and aligning for you, if you have provided the path to your keystore and the name of
+your key alias in the project's {@code build.properties} file. With this information provided,
+the build script will prompt you for your keystore and alias password when you perform
+<code>ant release</code>, it will sign the package and then align it. The final output
+file in {@code bin/} will instead be 
+<code><em>&lt;your_project_name></em>-release.apk</code>. With these steps
+automated for you, you're able to skip the manual procedures below (steps 3 and 4).
+To learn how to specify your keystore and alias in the {@code build.properties} file,
+see <a href="{@docRoot}guide/developing/other-ide.html#ReleaseMode">Developing In Other
+IDEs: Building in release mode</a>.</p>
+
+
+
+<h3 id="signapp">3. Sign your application with your private key</h3>
+
+<p>When you have an application package that is ready to be signed, you can do sign it
 using the Jarsigner tool. Make sure that you have Jarsigner available on your
 machine, as described in <a href="#setup">Basic Setup</a>. Also, make sure that
 the keystore containing your private key is  available.</p>
@@ -492,29 +518,63 @@ key.</p>
 http://java.sun.com/j2se/1.5.0/docs/tooldocs/#security</a></p>
 
 
-<h3 id="ExportWizard">Compiling and signing with Eclipse ADT</h3>
+<h3 id="align">4. Align the final APK package</h3>
 
-<p>When using Eclipse with ADT, you can use the Export Wizard to
+<p>Once you have signed the .apk with your private key, run <code>zipalign</code> on the file.
+This tool ensures that all uncompressed data starts with a particular byte alignment,
+relative to the start of the file. Ensuring alignment at 4-byte boundaries provides
+a performance optimization when installed on a device. When aligned, the Android
+system is able to read files with {@code mmap()}, even if
+they contain binary data with alignment restrictions, rather than copying all
+of the data from the package. The benefit is a reduction in the amount of
+RAM consumed by the running application.</p>
+
+<p>The <code>zipalign</code> tool is provided with the Android SDK, inside the 
+<code>tools/</code> directory. To align your signed .apk, execute:</p>
+
+<pre>zipalign -v 4 <em>your_project_name</em>-unaligned.apk <em>your_project_name</em>.apk</pre>
+
+<p>The {@code -v} flag turns on verbose output (optional). {@code 4} is the
+byte-alignment (don't use anything other than 4). The first file argument is
+your signed .apk (the input) and the second file is the destination .apk file (the output). 
+If you're overriding an existing .apk, add the {@code -f} flag.</p>
+
+<p class="caution"><strong>Caution:</strong> Your input .apk must be signed with your
+private key <strong>before</strong> you optimize the package with {@code zipalign}.
+If you sign it after using {@code zipalign}, it will undo the alignment.</p>
+
+<p>For more information, read about the 
+<a href="{@docRoot}guide/developing/tools/zipalign.html">zipalign</a> tool.
+
+
+<h3 id="ExportWizard">Compile and sign with Eclipse ADT</h3>
+
+<p>If you are using Eclipse with the ADT plugin, you can use the Export Wizard to
 export a <em>signed</em> .apk (and even create a new keystore,
 if necessary). The Export Wizard performs all the interaction with
-the Keytool and Jarsigner for you, which allows you to perform signing via a
-graphical interface instead of the command-line.
+the Keytool and Jarsigner for you, which allows you to sign the package using a GUI
+instead of performing the manual procedures to compile, sign,
+and align, as discussed above. Once the wizard has compiled and signed your package,
+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 <a href=#setup">Basic Setup for Signing</a>.</p>
 
-<p>To create a signed .apk, right-click the project in the Package 
-Explorer and select <strong>Android Tools > Export Signed Application Package</strong>.
-(Alternatively, open your <code>AndroidManifest.xml</code> file in Eclipse, open 
-the <em>Overview</em> tab, and click <strong>Use the Export Wizard</strong>.)
-The window that appears will display any errors found while 
-attempting to export your application. If no errors are found, continue with the
-Export Wizard, which will guide you through the process of signing your application,
-including steps for selecting the private key with which to sign the .apk,
-or creating a new keystore and private key.</p>
-
-<p>When you complete the Export Wizard, you'll
-have a signed .apk that's ready for distribution.</p>
+<p>To create a signed and aligned .apk in Eclipse:</p>
+
+<ol>
+  <li>Select the project in the Package 
+Explorer and select <strong>File > Export</strong>.</li>
+  <li>Open the Android folder, select Export Android Application, 
+  and click <strong>Next</strong>.
+  <p>The Export Android Application wizard now starts, which will 
+  guide you through the process of signing your application,
+  including steps for selecting the private key with which to sign the .apk
+  (or creating a new keystore and private key).</p>
+  <li>Complete the Export Wizard and your application will be compiled, 
+  signed, aligned, and ready for distribution.</li>
+</ol>
+
 
 
 <h2 id="secure-key">Securing Your Private Key</h2>
diff --git a/docs/html/guide/publishing/preparing.jd b/docs/html/guide/publishing/preparing.jd
index b4eaea39607f..5357166eb17a 100644
--- a/docs/html/guide/publishing/preparing.jd
+++ b/docs/html/guide/publishing/preparing.jd
@@ -220,22 +220,20 @@ elements, any MapView elements referencing the old Key will not have permission
 to download Maps data. </li>
 </ol>
 
-<p>For more information about signing and your private key, see <a
-href="{@docRoot}guide/publishing/app-signing.html">Signing Your Applications</a>.</p>
-
-
 <h2 id="compile">Compile your application</h2>
 
 <p>When you've prepared your application as described in the previous sections,
-you can compile your application for release. </p>
+you can compile your application for release.</p>
+
 
 <h2 id="post-compile">After compiling your application</h2>
 
 <h3 id="signapp">8. Sign your application</h3>
 
-<p>Sign your application using your private key. Signing your application
-correctly is critically important. Please see 
-<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your
+<p>Sign your application using your private key and then
+align it with the {@code zipalign} tool. Signing your application
+correctly is critically important. Please see
+<a href="{@docRoot}guide/publishing/app-signing.html">Signing Your 
 Applications</a> for complete information. </p>
 
 <h3 id="testapp">9. Test your compiled and signed application</h3>
diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd
index d0eafcd58d99..8d8b3041ebfa 100644
--- a/docs/html/guide/publishing/versioning.jd
+++ b/docs/html/guide/publishing/versioning.jd
@@ -17,7 +17,7 @@ page.title=Versioning Your Applications
 
 <ol>
 <li><a href="#appversion">Setting Application Version</a></li>
-<li><a href="#minsdkversion">Specifying Minimum System API Version</a>
+<li><a href="#minsdkversion">Specifying Your Application's System API Requirements</a>
 </ol>
 
 
@@ -125,31 +125,44 @@ applications use the
 {@link android.content.pm.PackageManager#getPackageInfo(java.lang.String, int)} 
 method of {@link android.content.pm.PackageManager PackageManager}. </p>
 
-<h2 id="minsdkversion">Specifying Minimum System API Version</h2>
+<h2 id="minsdkversion">Specifying Your Application's System API Requirements</h2>
 
 <p>If your application requires a specific minimum version of the Android
-platform, you can specify that version as an API Level identifier 
+platform, or is designed only to support a certain range of Android platform
+versions, you can specify those version requirements as API Level identifiers 
 in the application's manifest file. Doing so ensures that your 
 application can only be installed on devices that
 are running a compatible version of the Android system. </p>
 
-<p>To specify the minimum system version in the manifest, use this attribute: </p>
+<p>To specify API Level requirements, add a <code>&lt;uses-sdk&gt;</code> 
+element in the application's manifest, with one or more of these attributes: </p>
 
 <ul>
-<li><code>android:minSdkVersion</code> &mdash; An integer value corresponding to
-the code version of the Android platform. 
-<p>When preparing to install an application, the system checks the value of this
+<li><code>android:minSdkVersion</code> &mdash; The minimum version
+of the Android platform on which the application will run, specified
+by the platform's API Level identifier. </li>
+<li><code>android:maxSdkVersion</code> &mdash; The maximum version
+of the Android platform on which the application is designed to run, 
+specified by the platform's API Level identifier.  </li>
+</ul>
+
+<p>When preparing to install your application, the system checks the value of this
 attribute and compares it to the system version. If the
 <code>android:minSdkVersion</code> value is greater than the system version, the
-system aborts the installation of the application. </p>
+system aborts the installation of the application. Similarly, the system
+installs your application only if its <code>android:maxSdkVersion</code>
+is compatible with the platform version.</p>
 
-<p>If you do not specify this attribute in your manifest, the system assumes
-that your application is compatible with all platform versions.</p></li>
-</ul>
+<p>If you do not specify these attributes in your manifest, the system assumes
+that your application is compatible with all platform versions, with no
+maximum API Level. </p>
 
 <p>To specify a minimum platform version for your application, add a
 <code>&lt;uses-sdk&gt;</code> element as a child of
 <code>&lt;manifest&gt;</code>, then define the
 <code>android:minSdkVersion</code> as an attribute. </p>
 
-<p>For more information, also see the <a href="{@docRoot}sdk/android-1.1.html">Android System Image 1.1 Version Notes</a>.</p>
+<p>For more information, see the <a
+href="{@docRoot}guide/developing/manifest/uses-sdk-element.html"><code>&lt;uses-
+sdk&gt;</code></a> manifest element documentation and the <a
+href="{@docRoot}guide/appendix/api-levels.htmll">API Levels</a> document.</p>
diff --git a/docs/html/guide/samples/images/SearchableDictionary1.png b/docs/html/guide/samples/images/SearchableDictionary1.png
new file mode 100644
index 000000000000..ebb4604f8607
--- /dev/null
+++ b/docs/html/guide/samples/images/SearchableDictionary1.png
diff --git a/docs/html/guide/samples/images/SearchableDictionary2.png b/docs/html/guide/samples/images/SearchableDictionary2.png
new file mode 100644
index 000000000000..34746cd15563
--- /dev/null
+++ b/docs/html/guide/samples/images/SearchableDictionary2.png
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
index d8bbc4128c54..6e79d5020b01 100644
--- a/docs/html/guide/samples/index.jd
+++ b/docs/html/guide/samples/index.jd
@@ -33,6 +33,10 @@ can modify them and watch them execute. </p>
   <dd>An application for saving notes. Similar (but not identical) to the 
     <a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
   
+ <dt><a href="SearchableDictionary/index.html">Searchable Dictionary</a></dt>
+  <dd>A sample application that demonstrates Android's search framework, 
+  including how to provide search suggestions for Quick Search Box.</dd>
+  
  <dt><a href="Snake/index.html">Snake</a></dt>
   <dd>An implementation of the classic game "Snake."</dd>
   
diff --git a/docs/html/guide/topics/intents/intents-filters.jd b/docs/html/guide/topics/intents/intents-filters.jd
index fd20ca1799c9..962a00135a17 100644
--- a/docs/html/guide/topics/intents/intents-filters.jd
+++ b/docs/html/guide/topics/intents/intents-filters.jd
@@ -16,10 +16,11 @@ page.title=Intents and Intent Filters
 <h2>In this document</h2>
 <ol>
 <li><a href="#iobjs">Intent Objects</a></li>
-<li><a href="#ires">Intent Resolution</a>, including:</li>
+<li><a href="#ires">Intent Resolution</a></li>
 <li style="margin-left: 2em"><a href="#ifs">Intent filters</a></li>
 <li style="margin-left: 2em"><a href="#ccases">Common cases</a></li>
 <li style="margin-left: 2em"><a href="#imatch">Using intent matching</a></li>
+<li><a href="#npex">Note Pad Example</a></li>
 </ol>
 </div>
 </div>
@@ -31,7 +32,7 @@ broadcast receivers &mdash; are activated through messages, called <i>intents</i
 Intent messaging is a facility for late run-time binding between components in the same 
 or different applications.  The intent itself, an {@link android.content.Intent} 
 object, is a passive data structure holding an abstract description of an operation 
-to be performed &mdash; or, in the case of broadcasts, a description of something 
+to be performed &mdash; or, often in the case of broadcasts, a description of something 
 that has happened and is being announced.  There are separate mechanisms for 
 delivering intents to each type of component: 
 </p>
@@ -40,7 +41,9 @@ delivering intents to each type of component:
 <li>An Intent object is passed to <code>{@link android.content.Context#startActivity 
 Context.startActivity()}</code> or <code>{@link android.app.Activity#startActivityForResult 
 Activity.startActivityForResult()}</code> to launch an activity or get an existing 
-activity to do something new.</li>
+activity to do something new. (It can also be passed to 
+<code>{@link android.app.Activity#setResult(int, Intent) Activity.setResult()}</code>
+to return information to the activity that called {@code startActivityForResult()}.)</li>
 
 <li><p>An Intent object is passed to <code>{@link android.content.Context#startService 
 Context.startService()}</code> to initiate a service or deliver new instructions to an 
@@ -380,22 +383,12 @@ component's filters.
 
 <p>
 A component has separate filters for each job it can do, each face it can 
-present to the user.  For example, the principal activity of the sample
-NotePad application has three filters &mdash; one for starting up with a
-blank slate, another for starting with an assigned directory of notes 
-that the user can view, edit, or select from, and a third for finding a 
-particular note without an initial specification of its directory.
-</p>
-
-<p>
-An intent filter is an instance of the {@link android.content.IntentFilter} class.  
-However, since the Android system must know about the capabilities of a component 
-before it can launch that component, intent filters are generally not set up in 
-Java code, but in the application's manifest file (AndroidManifest.xml) as 
-{@code &lt;intent-filter&gt;} elements.  (The one exception would be filters for 
-broadcast receivers that are registered dynamically by calling <code>{@link android.content.Context#registerReceiver(BroadcastReceiver, IntentFilter, String, 
-Handler) Context.registerReceiver()}</code>; they are directly created as 
-IntentFilter objects.)
+present to the user.  For example, the NoteEditor activity of the sample
+Note Pad application has two filters &mdash; one for starting up with a
+specific note that the user can view or edit, and another for starting 
+with a new, blank note that the user can fill in and save.  (All of Note 
+Pad's filters are described in the <a href="#npex">Note Pad Example</a>
+section, later.)
 </p>
 
 <div class="sidebox-wrapper">
@@ -413,6 +406,18 @@ name the component as the target.
 </div> 
 
 <p>
+An intent filter is an instance of the {@link android.content.IntentFilter} class.  
+However, since the Android system must know about the capabilities of a component 
+before it can launch that component, intent filters are generally not set up in 
+Java code, but in the application's manifest file (AndroidManifest.xml) as 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> 
+elements.  (The one exception would be filters for 
+broadcast receivers that are registered dynamically by calling <code>{@link android.content.Context#registerReceiver(BroadcastReceiver, IntentFilter, String, 
+Handler) Context.registerReceiver()}</code>; they are directly created as 
+IntentFilter objects.)
+</p>
+
+<p>
 A filter has fields that parallel the action, data, and category fields of an 
 Intent object.  An implicit intent is tested against the filter in all three areas.  
 To be delivered to the component that owns the filter, it must pass all three tests.  
@@ -429,8 +434,11 @@ Each of the three tests is described in detail below:
 <dl>
 
 <dt><b>Action test</b></dt>
-<dd>An {@code &lt;intent-filter&gt;} element in the manifest file lists actions 
-as {@code &lt;action&gt;} subelements.  For example:
+<dd>An 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code>
+element in the manifest file lists actions as 
+<code><a href="{@docRoot}guide/topics/manifest/action-element.html">&lt;action&gt;</a></code> 
+subelements.  For example:
 
 <pre>&lt;intent-filter . . . &gt;
     &lt;action android:name="com.example.project.SHOW_CURRENT" /&gt;
@@ -464,8 +472,9 @@ contains at least one action.</p></li>
 </dd>
 
 <dt><b>Category test</b></dt>
-<dd>An {@code &lt;intent-filter&gt;} element also lists categories as subelements.  
-For example:
+<dd>An 
+<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></code> 
+element also lists categories as subelements.  For example:
 
 <pre>&lt;intent-filter . . . &gt;
     &lt;category android:name="android.intent.category.DEFAULT" /&gt;
@@ -512,14 +521,16 @@ is contained in a subelement.  And, as in those cases, the subelement can appear
 multiple times, or not at all.  For example:
 
 <pre>&lt;intent-filter . . . &gt;
-    &lt;data android:type="video/mpeg" android:scheme="http" . . . /&gt; 
-    &lt;data android:type="audio/mpeg" android:scheme="http" . . . /&gt;
+    &lt;data android:mimeType="video/mpeg" android:scheme="http" . . . /&gt; 
+    &lt;data android:mimeType="audio/mpeg" android:scheme="http" . . . /&gt;
     . . .
 &lt;/intent-filter&gt;</pre>
 
 <p>
-Each {@code &lt;data&gt;} element can specify a URI and a data type (MIME media type).  
-There are separate attributes &mdash; {@code scheme}, {@code host}, {@code port}, 
+Each 
+<code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code> 
+element can specify a URI and a data type (MIME media type).  There are separate 
+attributes &mdash; {@code scheme}, {@code host}, {@code port}, 
 and {@code path} &mdash; for each part of the URI:  
 </p>
 
@@ -607,7 +618,7 @@ for example, tells Android that the component can get image data from a content
 provider and display it:
 </p>
 
-<pre>&lt;data android:type="image/*" /&gt;</pre>
+<pre>&lt;data android:mimeType="image/*" /&gt;</pre>
 
 <p>
 Since most available data is dispensed by content providers, filters that 
@@ -681,6 +692,357 @@ can respond.  There's a similar method,
 queryBroadcastReceivers()}, for broadcast receivers.
 </p>
 
+<h2 id="npex">Note Pad Example</h2>
+
+<p>
+The Note Pad sample application enables users to browse through a list 
+of notes, view details about individual items in the list, edit the items, 
+and add a new item to the list.  This section looks at the intent filters
+declared in its manifest file.  (If you're working offline in the SDK, you 
+can find all the source files for this sample application, including its 
+manifest file, at {@code &lt;sdk&gt;/samples/NotePad/index.html}.  
+If you're viewing the documentation online, the source files are in the 
+<a href="{@docRoot}guide/samples/index.html">Tutorials and Sample Code</a> 
+section <a href="{@docRoot}guide/samples/NotePad/index.html">here</a>.)
+</p>
+
+<p>
+In its manifest file, the Note Pad application declares three activities,
+each with at least one intent filter.  It also declares a content provider 
+that manages the note data.  Here is the manifest file in its entirety:
+</p>
+
+<pre>&lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.android.notepad"&gt;
+    &lt;application android:icon="@drawable/app_notes"
+                 android:label="@string/app_name" &gt;
+
+        &lt;provider android:name="NotePadProvider"
+                  android:authorities="com.google.provider.NotePad" /&gt;
+
+        &lt;activity android:name="NotesList" android:label="@string/title_notes_list"&gt;
+            &lt;intent-filter&gt;
+                &lt;action android:name="android.intent.action.MAIN" /&gt;
+                &lt;category android:name="android.intent.category.LAUNCHER" /&gt;
+            &lt;/intent-filter&gt;
+            &lt;intent-filter&gt;
+                &lt;action android:name="android.intent.action.VIEW" /&gt;
+                &lt;action android:name="android.intent.action.EDIT" /&gt;
+                &lt;action android:name="android.intent.action.PICK" /&gt;
+                &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+                &lt;data android:mimeType="vnd.android.cursor.dir/vnd.google.note" /&gt;
+            &lt;/intent-filter&gt;
+            &lt;intent-filter&gt;
+                &lt;action android:name="android.intent.action.GET_CONTENT" /&gt;
+                &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+                &lt;data android:mimeType="vnd.android.cursor.item/vnd.google.note" /&gt;
+            &lt;/intent-filter&gt;
+        &lt;/activity&gt;
+        
+        &lt;activity android:name="NoteEditor"
+                  android:theme="@android:style/Theme.Light"
+                  android:label="@string/title_note" &gt;
+            &lt;intent-filter android:label="@string/resolve_edit"&gt;
+                &lt;action android:name="android.intent.action.VIEW" /&gt;
+                &lt;action android:name="android.intent.action.EDIT" /&gt;
+                &lt;action android:name="com.android.notepad.action.EDIT_NOTE" /&gt;
+                &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+                &lt;data android:mimeType="vnd.android.cursor.item/vnd.google.note" /&gt;
+            &lt;/intent-filter&gt;
+            &lt;intent-filter&gt;
+                &lt;action android:name="android.intent.action.INSERT" /&gt;
+                &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+                &lt;data android:mimeType="vnd.android.cursor.dir/vnd.google.note" /&gt;
+            &lt;/intent-filter&gt;
+        &lt;/activity&gt;
+        
+        &lt;activity android:name="TitleEditor" 
+                  android:label="@string/title_edit_title"
+                  android:theme="@android:style/Theme.Dialog"&gt;
+            &lt;intent-filter android:label="@string/resolve_title"&gt;
+                &lt;action android:name="com.android.notepad.action.EDIT_TITLE" /&gt;
+                &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+                &lt;category android:name="android.intent.category.ALTERNATIVE" /&gt;
+                &lt;category android:name="android.intent.category.SELECTED_ALTERNATIVE" /&gt;
+                &lt;data android:mimeType="vnd.android.cursor.item/vnd.google.note" /&gt;
+            &lt;/intent-filter&gt;
+        &lt;/activity&gt;
+        
+    &lt;/application&gt;
+&lt;/manifest&gt;</pre>
+
+<p>
+The first activity, NotesList, is 
+distinguished from the other activities by the fact that it operates 
+on a directory of notes (the note list) rather than on a single note.  
+It would generally serve as the initial user interface into the 
+application.  It can do three things as described by its three intent 
+filters:
+</p>
+
+<ol>
+<li><pre>&lt;intent-filter&gt;
+    &lt;action android:name="android.intent.action.MAIN" /&gt;
+    &lt;category android:name="android.intent.category.LAUNCHER" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+<p>
+This filter declares the main entry point into the Note Pad application.  
+The standard {@code MAIN} action is an entry point that does not require 
+any other information in the Intent (no data specification, for example), 
+and the {@code LAUNCHER} category says that this entry point should be 
+listed in the application launcher.
+</p></li>
+
+<li><pre>&lt;intent-filter&gt;
+    &lt;action android:name="android.intent.action.VIEW" /&gt;
+    &lt;action android:name="android.intent.action.EDIT" /&gt;
+    &lt;action android:name="android.intent.action.PICK" /&gt;
+    &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+    &lt;data android:mimeType="vnd.android.cursor.dir/vnd.google.note" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+<p>
+This filter declares the things that the activity can do on a directory 
+of notes.  It can allow the user to view or edit the directory (via
+the {@code VIEW} and {@code EDIT} actions), or to pick a particular note 
+from the directory (via the {@code PICK} action).
+</p> 
+
+<p>
+The {@code mimeType} attribute of the 
+<code><a href="{@docRoot}guide/topics/manifest/data-element.html">&lt;data&gt;</a></code> 
+element specifies the kind of data that these actions operate on.  It 
+indicates that the activity can get a Cursor over zero or more items 
+({@code vnd.android.cursor.dir}) from a content provider that holds
+Note Pad data ({@code vnd.google.note}).  The Intent object that launches
+the activity would include a {@code content:} URI specifying the exact 
+data of this type that the activity should open.
+</p>
+
+<p>
+Note also the {@code DEFAULT} category supplied in this filter.  It's
+there because the <code>{@link android.content.Context#startActivity  
+Context.startActivity()}</code> and 
+<code>{@link android.app.Activity#startActivityForResult  
+Activity.startActivityForResult()}</code> methods treat all intents 
+as if they contained the {@code DEFAULT} category &mdash; with just
+two exceptions:
+</p>
+
+<ul>
+<li>Intents that explicitly name the target activity</li>
+<li>Intents consisting of the {@code MAIN} action and {@code LAUNCHER} 
+category</li>
+</ul>
+
+<p>
+Therefore, the {@code DEFAULT} category is <em>required</em> for all 
+filters &mdash; except for those with the {@code MAIN} action and 
+{@code LAUNCHER} category.  (Intent filters are not consulted for
+explicit intents.)  
+</p></li>
+
+<li><pre>&lt;intent-filter&gt;
+    &lt;action android:name="android.intent.action.GET_CONTENT" /&gt;
+    &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+    &lt;data android:mimeType="vnd.android.cursor.item/vnd.google.note" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+<p>
+This filter describes the activity's ability to return a note selected by
+the user without requiring any specification of the directory the user should 
+choose from.  The {@code GET_CONTENT} action is similar to the {@code PICK} 
+action.  In both cases, the activity returns the URI for a note selected by 
+the user.  (In each case, it's returned to the activity that called
+<code>{@link android.app.Activity#startActivityForResult 
+startActivityForResult()}</code> to start the NoteList activity.)  Here, 
+however, the caller specifies the type of data desired instead of the 
+directory of data the user will be picking from.
+</p>
+
+<p>
+The data type, <code>vnd.android.cursor.item/vnd.google.note</code>, 
+indicates the type of data the activity can return &mdash; a URI for 
+a single note.  From the returned URI, the caller can get a Cursor for 
+exactly one item ({@code vnd.android.cursor.item}) from the content 
+provider that holds Note Pad data ({@code vnd.google.note}).
+</p>
+
+<p>
+In other words, for the {@code PICK} action in the previous filter, 
+the data type indicates the type of data the activity could display to the 
+user.  For the {@code GET_CONTENT} filter, it indicates the type of data 
+the activity can return to the caller.
+</p></li>
+</ol>
+
+<p>
+Given these capabilities, the following intents will resolve to the
+NotesList activity:
+</p>
+
+<dl style="margin-left: 2em">
+<dt>action: <code>android.intent.action.MAIN</code></dt>
+<dd>Launches the activity with no data specified.</dd>
+
+<dt>action: <code>android.intent.action.MAIN</code>
+<br/>category: <code>android.intent.category.LAUNCHER</code></dt>
+<dd> Launches the activity with no data selected specified. 
+This is the actual intent used by the Launcher to populate its top-level 
+list.  All activities with filters that match this action and category
+are added to the list.</dd>
+
+<dt>action: <code>android.intent.action.VIEW</code>
+<br/>data: <code>content://com.google.provider.NotePad/notes</code></dt>
+<dd>Asks the activity to display a list of all the notes under
+<code>content://com.google.provider.NotePad/notes</code>.  The user can then 
+browse through the list and get information about the items in it.</dd>
+
+<dt>action: <code>android.intent.action.PICK</code>
+<br/>data: <code>content://com.google.provider.NotePad/notes</code></dt>
+<dd>Asks the activity to display a list of the notes under
+<code>content://com.google.provider.NotePad/notes</code>.
+The user can then pick a note from the list, and the activity will return 
+the URI for that item back to the activity that started the NoteList activity.</dd>
+
+<dt>action: <code>android.intent.action.GET_CONTENT</code>
+<br/>data type: <code>vnd.android.cursor.item/vnd.google.note</code></dt>
+<dd>Asks the activity to supply a single item of Note Pad data.</dd>
+</dl>
+
+<p>
+The second activity, NoteEditor, shows 
+users a single note entry and allows them to edit it.  It can do two things 
+as described by its two intent filters:
+
+<ol>
+<li><pre>&lt;intent-filter android:label="@string/resolve_edit"&gt;
+    &lt;action android:name="android.intent.action.VIEW" /&gt;
+    &lt;action android:name="android.intent.action.EDIT" /&gt;
+    &lt;action android:name="com.android.notepad.action.EDIT_NOTE" /&gt;
+    &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+    &lt;data android:mimeType="vnd.android.cursor.item/vnd.google.note" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+<p>
+The first, primary, purpose of this activity is to enable the user to 
+interact with a single note &mdash to either {@code VIEW} the note or 
+{@code EDIT} it.  (The {@code EDIT_NOTE} category is a synonym for 
+{@code EDIT}.)  The intent would contain the URI for data matching the 
+MIME type <code>vnd.android.cursor.item/vnd.google.note</code> &mdash;
+that is, the URI for a single, specific note.  It would typically be a 
+URI that was returned by the {@code PICK} or {@code GET_CONTENT} 
+actions of the NoteList activity.
+</p>
+
+<p>
+As before, this filter lists the {@code DEFAULT} category so that the 
+activity can be launched by intents that don't explicitly specify the
+NoteEditor class.
+</p></li>
+
+<li><pre>&lt;intent-filter&gt;
+    &lt;action android:name="android.intent.action.INSERT" /&gt;
+    &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+    &lt;data android:mimeType="vnd.android.cursor.dir/vnd.google.note" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+<p>
+The secondary purpose of this activity is to enable the user to create a new 
+note, which it will {@code INSERT} into an existing directory of notes.  The 
+intent would contain the URI for data matching the MIME type
+<code>vnd.android.cursor.dir/vnd.google.note</code> &mdash; that 
+is, the URI for the directory where the note should be placed.
+</p></li>  
+</ol>
+
+<p>
+Given these capabilities, the following intents will resolve to the
+NoteEditor activity:
+</p>
+
+<dl style:"margin-left: 2em">
+<dt>action: <code>android.intent.action.VIEW</code>
+<br/>data: <code>content://com.google.provider.NotePad/notes/<var>ID</var></code></dt>
+<dd>Asks the activity to display the content of the note identified 
+by {@code <var>ID</var>}. (For details on how {@code content:} URIs
+specify individual members of a group, see 
+<a href="{@docRoot}guide/topics/provider/content-providers.html">Content Providers</a>.)
+
+<dt>action: <code>android.intent.action.EDIT</code>
+<br/>data: <code>content://com.google.provider.NotePad/notes/<var>ID</var></code></dt>
+<dd>Asks the activity to display the content of the note identified 
+by {@code <var>ID</var>}, and to let the user edit it.  If the user 
+saves the changes, the activity updates the data for the note in the 
+content provider.</dd>
+
+<dt>action: <code>android.intent.action.INSERT</code>
+<br/>data: <code>content://com.google.provider.NotePad/notes</code></dt>
+<dd>Asks the activity to create a new, empty note in the notes list at
+<code>content://com.google.provider.NotePad/notes</code>
+and allow the user to edit it.  If the user saves the note, its URI
+is returned to the caller.
+</dd>
+</dl>
+
+<p>The last activity, TitleEditor, 
+enables the user to edit the title of a note.  This could be implemented 
+by directly invoking the activity (by explicitly setting its component 
+name in the Intent), without using an intent filter.  But here we take 
+the opportunity to show how to publish alternative operations on existing 
+data:
+</p>
+
+<pre>&lt;intent-filter android:label="@string/resolve_title"&gt;
+    &lt;action android:name="com.android.notepad.action.EDIT_TITLE" /&gt;
+    &lt;category android:name="android.intent.category.DEFAULT" /&gt;
+    &lt;category android:name="android.intent.category.ALTERNATIVE" /&gt;
+    &lt;category android:name="android.intent.category.SELECTED_ALTERNATIVE" /&gt;
+    &lt;data android:mimeType="vnd.android.cursor.item/vnd.google.note" /&gt;
+&lt;/intent-filter&gt;</pre>
+
+<p>
+The single intent filter for this activity uses a custom action called
+"<code>com.android.notepad.action.EDIT_TITLE</code>".  It must be invoked on
+a specific note (data type <code>vnd.android.cursor.item/vnd.google.note</code>),
+like the previous {@code VIEW} and {@code EDIT} actions.  However, here the 
+activity displays the title contained in the note data, not the content of 
+the note itself.
+</p>
+
+<p>
+In addition to supporting the usual {@code DEFAULT} category, the title 
+editor also supports two other standard categories: 
+<code>{@link android.content.Intent#CATEGORY_ALTERNATIVE ALTERNATIVE}</code>
+and <code>{@link android.content.Intent#CATEGORY_SELECTED_ALTERNATIVE 
+SELECTED_ALTERNATIVE}</code>.
+These categories identify activities that can be presented to users in 
+a menu of options (much as the {@code LAUNCHER} category identifies 
+activities that should be presented to user in the application launcher).  
+Note that the filter also supplies an explicit label (via 
+<code>android:label="@string/resolve_title"</code>) to better control
+what users see when presented with this activity as an alternative
+action to the data they are currently viewing.  (For more information 
+on these categories and building options menus, see the 
+<code>{@link android.content.pm.PackageManager#queryIntentActivityOptions 
+PackageManager.queryIntentActivityOptions()}</code> and 
+<code>{@link android.view.Menu#addIntentOptions Menu.addIntentOptions()}</code>
+methods.)
+</p>
+
+<p>
+Given these capabilities, the following intent will resolve to the
+TitleEditor activity:
+</p>
+
+<dl style="margin-left: 2em">
+<dt>action: <code>com.android.notepad.action.EDIT_TITLE</code>
+<br/>data: <code>content://com.google.provider.NotePad/notes/<var>ID</var></code></dt>
+<dd>Asks the activity to display the title associated with note <var>ID</var>, and 
+allow the user to edit the title.</dd>
+</dl>
+
 
 
 
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 2626735cae11..e5083923370f 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -6,7 +6,8 @@ page.title=&lt;uses-feature&gt;
 <dt>syntax:</dt>
 <dd>
 <pre class="stx">
-&lt;uses-feature android:<a href="#glEsVersion">glEsVersion</a>=["true" | "false"] /&gt;
+&lt;uses-feature android:<a href="#glEsVersion">glEsVersion</a>="<em>integer</em>"
+              android:<a href="#name">name</a>="<em>string</em>" /&gt;
 </pre>
 </dd>
 
@@ -14,15 +15,60 @@ page.title=&lt;uses-feature&gt;
 <dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
 
 <dt>description:</dt>
-<dd>This element specifies specific features used by the application.
+<dd>This element declares a specific feature used by the application.
 Android provides some features that may not be equally supported by all
 Android devices. In a manner similar to the <code><a href="uses-sdk-element.html">&lt;uses-sdk></a></code> 
-element, this element allows an application to specify which potentially variable
-features it requires. In this way, the application
-will not be installed on devices that do not offer the required feature.</p>
+element, this element allows an application to specify which device-variable
+features it uses. In this way, the application
+will not be installed on devices that do not offer the feature.</p>
+
+<p>For example, an application might specify that it requires a camera with auto-focus capabilities.
+If a device does not provide a camera with auto-focus, then it will not allow
+installation of the application.</p>
+
+<p>In order to maintain strict device compatibility, it's very important that you use
+this element to declare all features that your application uses. Failure to declare
+a feature may result your application being installed on a device
+that does not support the feature and your application failing.</p>
+
+<p>For some features, there may exist a specfic attribute that allows you to define
+a version of the feature, such as the version of Open GL used (declared with
+<a href="#glEsVersion">{@code glEsVersion}</a>). Other features that either do or do not
+exist for a device, such as camera auto-focus, are declared using the
+<a href="#name">{@code name}</a> attribute.</p>
+
+<p>Any software or hardware features that may vary among Android-powered
+devices will be listed on this page among the attributes below. If you see any features
+here that you use in your application, you should include a {@code
+&lt;uses-feature>} element for each one. For example, if your application uses the device
+camera, then you should include the following in your {@code AndroidManifest.xml}:</p>
+
+<pre>
+&lt;uses-feature android:name="android.hardware.camera" />
+</pre>
+
+<p>If you declare "android.hardware.camera", then your application is considered
+compatible with all devices that include a camera, regardless of whether auto-focus is
+available or not. If you also use the auto-focus features (available through the {@link
+android.hardware.Camera Camera API}), then you need to include an additional
+{@code &lt;uses-feature>} element that declares the "android.hardware.camera.autofocus"
+feature. Also note that you must still request the {@link android.Manifest.permission#CAMERA
+CAMERA permission}. Requesting permission grants your application access to the
+appropriate hardware and software, while declaring the features used by
+your application ensures proper device compatibility.</p>
+
+<p>Although the {@code &lt;uses-feature>} element is only activated for devices running 
+API Level 4 or higher, it is safe to include this for applications that declare 
+a <a href="uses-sdk-element.html#min">{@code minSdkVersion}</a> 
+of "3" or lower. Devices running older versions of the platform 
+will simply ignore this element, but newer devices will recognize it and enforce 
+installation restrictions based on whether the device supports the feature.</p>
+
+<p class="note"><strong>Note:</strong>
+For each feature required by your application, you must include a new {@code
+&lt;uses-feature>} element. Multiple features cannot be declared in one 
+instance of this element.</p>
 
-<p>For example, an application might specify that it requires a certain version of Open GL.
-If a device does not support that version of Open GL, then it will not allow installation of the application.</p>
 </dd> 
 
 
@@ -38,6 +84,44 @@ If a device does not support that version of Open GL, then it will not allow ins
 </dl>
 </dd>
 
+<dd>
+<dl class="attr"><dt><a name="name"></a>{@code android:name}</dt>
+  <dd>The name of a feature required by the application. 
+  The value must be one of the following accepted strings:
+  
+  <table> 
+    <tr> 
+       <th>Feature</th>
+       <th>Value</th> 
+       <th>Description</th> 
+    </tr><tr> 
+       <td rowspan="3">Camera</td>
+       <td>"{@code android.hardware.camera}"</td> 
+       <td>The application requires a camera.</td> 
+    </tr><tr> 
+       <td>"{@code android.hardware.camera.autofocus}"</td> 
+       <td>The application requires a camera with auto-focus capability.
+       As a prerequisite, "{@code android.hardware.camera}" must also be declared
+       with a separate {@code &lt;uses-feature>} element.
+       </td>
+     <tr>
+       <td colspan="2">
+         <strong>Note:</strong> Any application that requests the 
+         {@link android.Manifest.permission#CAMERA CAMERA permission} but does <em>not</em>
+         declare any camera features with the {@code &lt;uses-feature>} element will be assumed
+         to use all camera features (such as auto-focus). Thus, the application will not
+         be compatible with devices that do not support all features. Please use 
+         {@code &lt;uses-feature>} to declare only the camera features that your 
+         application needs.
+       </td>
+     </tr>
+    </tr>
+  </table>
+  
+  </dd>
+</dl>
+</dd>
+
 <!-- ##api level indication## -->
 <dt>introduced in:</dt>
 <dd>API Level 4</dd>
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index adcdc286cbed..ee8d03dc06d1 100644
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -3,7 +3,10 @@ page.title=&lt;uses-sdk&gt;
 
 <dl class="xml">
 <dt>syntax:</dt>
-<dd><pre class="stx">&lt;uses-sdk android:<a href="#min">minSdkVersion</a>="<i>integer</i>" /&gt;</pre></dd>
+<dd><pre>
+&lt;uses-sdk android:<a href="#min">minSdkVersion</a>="<i>integer</i>" 
+          android:<a href="#max">maxSdkVersion</a>="<i>integer</i>"
+          android:<a href="#target">targetSdkVersion</a>="<i>integer</i>" /&gt;</pre></dd>
 
 <dt>contained in:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
@@ -64,12 +67,16 @@ and minor versions).</p>
   <dt><a name="target"></a>{@code android:targetSdkVersion}</dt>
   <dd>An integer designating the API Level that the application is targetting.
   
-  <p>With this attribute set, the application says that is is be able to run on 
+  <p>With this attribute set, the application says that it is able to run on 
   older versions (down to {@code minSdkVersion}), but was explicitly tested to work 
   with the version specified here.
-  Specifying this version allows the platform to disable compatibility
-  code that is not required or enable newer features that are not
-  available to older applications.</p>
+  Specifying this target version allows the platform to disable compatibility
+  settings that are not required for the target version (which may otherwise be turned on
+  in order to maintain forward-compatibility) or enable newer features that are not
+  available to older applications. This does not mean that you can program different 
+  features for different versions of the platform&mdash;it simply informs the platform that you
+  have tested against the target version and the platform should not perform any extra
+  work to maintain forward-compatibility with the target version.</p>
   
   <p>Introduced in: API Level 4</p>
   </dd>
diff --git a/docs/html/images/emulator-wvga800l.png b/docs/html/images/emulator-wvga800l.png
new file mode 100644
index 000000000000..a2140338a469
--- /dev/null
+++ b/docs/html/images/emulator-wvga800l.png
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 823ec96192e5..6945f9ebacf7 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -15,12 +15,12 @@ home=true
                                 <div id="announcement" style="width:275px">
                                   <p>The second Android Developer Challenge has begun! In this contest,
                                   real-world users will help review and score applications and the overall winner will 
-                                  take away $250,000. The deadline for submitting an application to the contest is August 31, 2009.</p>
+                                  take away $250,000. The deadline for submissions was August 31, 2009 and judging by users has started.</p>
                                   <p><a href="http://code.google.com/android/adc/">Learn more about ADC 2 &raquo;</a></p>
                                 </div> <!-- end annoucement -->
                             </div> <!-- end annoucement-block -->  
                         </div><!-- end topAnnouncement -->
-                        <div id="carouselMain" style="height:192px"> <!-- this height can be adjusted based on the content height -->
+                        <div id="carouselMain" style="height:190px"> <!-- this height can be adjusted based on the content height -->
                         </div>
                             <div class="clearer"></div>
                         <div id="carouselWheel">
@@ -120,12 +120,17 @@ home=true
     'sdk': {
       'layout':"imgLeft",
       'icon':"sdk-small.png",
-      'name':"SDK 1.5 r3",
-      'img':"sdk-large.png",
-      'title':"Android 1.5 SDK",
-      'desc': "<p>Android 1.5 SDK is now available. It includes new APIs for Android 1.5, updated developer tools, multiple platform versions, and a Google APIs add-on.</p><p><a href='{@docRoot}sdk/1.5_r3/index.html'>Download Android 1.5 SDK &raquo;</a></p>"
+      'name':"Android 1.6 SDK",
+      'img':"donut-android.png",
+      'title':"Android 1.6 SDK",
+      'desc': "<p>The Android 1.6 SDK is now available, with new APIs and updated tools!</p>"
+               + " <p>For more about the Android 1.6 platform, read the <a href='http://developer.android.com/sdk/android-1.6-highlights.html'>highlights</a>"
+               + "<!--and watch some <a href='http://developer.android.com/videos/index.html'>videos</a>-->."
+               + " Also keep an eye on the <a href='http://android-developers.blogspot.com'>Blog</a>"
+               + " for posts about some of the new developer technologies in Android 1.6.</p>"
+               + "<p><a href='{@docRoot}sdk/1.6_r1/index.html'>Download the Android 1.6 SDK &raquo;</a></p>"
     },
-    
+
     'io': {
       'layout':"imgLeft",
       'icon':"io-small.png",
diff --git a/docs/html/intl/ja/community/index.jd b/docs/html/intl/ja/community/index.jd
index e0a645b2280c..659aee7d68f1 100644
--- a/docs/html/intl/ja/community/index.jd
+++ b/docs/html/intl/ja/community/index.jd
@@ -40,38 +40,46 @@ page.title=コミュニティ
 
 <h3 id="ApplicationDeveloperLists">アプリケーション デベロッパー メーリング リスト</h3>
 <ul>
+
+<li><b>Android SDK Japan</b> - Android SDK に関する質問と答え、提案とフィードバックを交換できる場です。
+<ul>
+<li>Google グループで登録:&nbsp;<a href="http://groups.google.co.jp/group/android-sdk-japan?hl=ja">android-sdk-japan</a></li>
+<li>メールで登録:&nbsp;<a href="mailto:android-sdk-japan-subscribe@googlegroups.com">android-sdk-japan-subscribe@googlegroups.com</a></li>
+</ul>
+</li>
+
 <li><b>Android 初心者向け</b> - Android アプリケーションの開発初心者向けです。Android SDK と基本的な Android API の利用方法について学習したい場合は、このメーリング リストから始めてください。このメーリング リストには、SDK を利用するデベロッパーの初歩的なディスカッションの場所です。Android プラットフォームで初めてアプリケーションを作成して実行する際は、非常に有益な情報を得ることができるでしょう。開発環境のインストール方法についての質問を投稿したり、Android 開発の初歩（初めて作成するユーザー インターフェース、権限、Android ファイルシステムでのファイル、Android マーケットでのアプリケーションなど）について教えてもらうことができます。新たに質問する前に、必ず最初にアーカイブを確認してください。高度な内容の質問の場合はここでは質問せず、android-developers メーリング リストで質問してください。また使用に関する質問は、android-discuss メーリング リストの方が適しています。
 <ul>
 <li>Google グループで登録:&nbsp;<a href="http://groups.google.com/group/android-beginners?hl=ja">android-beginners</a></li>
-<li>メールで登録:&nbsp;<a href="mailto:android-beginners-subscribe@googlegroups.com">android-beginners-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com"> </a></li>
+<li>メールで登録:&nbsp;<a href="mailto:android-beginners-subscribe@googlegroups.com">android-beginners-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android デベロッパー向け</b> - Android アプリケーション デベロッパーとして経験を積むにつれ、Android アプリケーション開発の基本を把握して、SDK を使いこなせるようになります。今度は、より高度な内容について質問する必要があります。アプリケーションのトラブルシューティング、実装へのアドバイス、アプリケーションのパフォーマンスやユーザー エクスペリエンスを改良するテクニックに関する質問には、次のメーリング リストが役立ちます。使用に関する問題（android-discuss をご利用ください）や、Android SDK を使用する際の初歩的質問（android-beginners をご利用ください）についてのディスカッションの場所ではありません。
 <ul>
 <li>Google グループで登録:&nbsp;<a href="http://groups.google.com/group/android-developers?hl=ja">android-developers</a></li>
-<li>メールで登録:&nbsp;<a href="mailto:android-developers-subscribe@googlegroups.com">android-developers-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com"> </a></li>
+<li>メールで登録:&nbsp;<a href="mailto:android-developers-subscribe@googlegroups.com">android-developers-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android ディスカッション</b> - Android に関する「井戸端会議」です。ここでは、Android プラットフォームへのアイデア、自分のアプリケーションの公表、Android 携帯端末に関するディスカッション、コミュニティ リソースなど、Android に関することなら何でも投稿可能です。ただし他のメーリング リストに該当する内容の場合は、そのメーリング リストに投稿することをおすすめします。質問のテーマが限定されている場所の方が、より多くの回答を得ることができるでしょう。
 <ul>
 <li>Google グループで登録:&nbsp;<a href="http://groups.google.com/group/android-discuss?hl=ja">android-discuss</a></li>
-<li>メールで登録:&nbsp;<a href="mailto:android-discuss-subscribe@googlegroups.com">android-discuss-subscribe@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com"> </a></li>
+<li>メールで登録:&nbsp;<a href="mailto:android-discuss-subscribe@googlegroups.com">android-discuss-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android セキュリティ ディスカッション</b> - 安全な開発、新たに発生したセキュリティの問題、Android デベロッパー向けの Android デベロッパーによるベスト プラクティスについて自由にディスカッションを行える場所です。メーリング リストで脆弱性を直接公開することは、すべての Android ユーザーを危険にさらすことになるので、避けてください。
 <ul>
 <li>Google グループで登録:&nbsp;<a href="http://groups.google.com/group/android-security-discuss?hl=ja">android-security-discuss</a></li>
-<li>メールで登録:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-security-discuss@googlegroups.com</a><a href="mailto:android-platform-subscribe@googlegroups.com"> </a></li>
+<li>メールで登録:&nbsp;<a href="mailto:android-security-discuss@googlegroups.com">android-security-discuss@googlegroups.com</a></li>
 </ul>
 </li>
 
 <li><b>Android セキュリティに関する発表</b> - Android セキュリティ チームがセキュリティ関連の発表を行う、小規模なグループです。
 <ul>
 <li>Google グループで登録:&nbsp;<a href="http://groups.google.com/group/android-security-announce?hl=ja">android-security-announce</a></li>
-<li>メールで登録:&nbsp;<a href="mailto:android-security-announce-subscribe@googlegroups.com">android-security-announce-subscribe@googlegroups.com</a> <a href="mailto:android-platform-subscribe@googlegroups.com"> </a></li>
+<li>メールで登録:&nbsp;<a href="mailto:android-security-announce-subscribe@googlegroups.com">android-security-announce-subscribe@googlegroups.com</a></li>
 </ul>
 </li>
 
diff --git a/docs/html/sdk/1.6_r1/index.jd b/docs/html/sdk/1.6_r1/index.jd
new file mode 100644
index 000000000000..11d369be1b23
--- /dev/null
+++ b/docs/html/sdk/1.6_r1/index.jd
@@ -0,0 +1,140 @@
+page.title=Android 1.6 SDK, Release 1
+sdk.redirect=0
+sdk.version=1.6
+
+sdk.date=September 2009
+
+sdk.win_download=android-sdk-windows-1.6_r1.zip
+sdk.win_bytes=
+sdk.win_checksum=
+
+sdk.mac_download=android-sdk-mac_x86-1.6_r1.zip
+sdk.mac_bytes=
+sdk.mac_checksum=
+
+sdk.linux_download=android-sdk-linux_x86-1.6_r1.tgz
+sdk.linux_bytes=
+sdk.linux_checksum=
+
+adt.zip_download=ADT-0.9.3.zip
+adt.zip_version=0.9.3
+adt.zip_bytes=
+adt.zip_checksum=
+
+@jd:body
+
+<p>For more information on this SDK release, read the
+<a href="{@docRoot}sdk/RELEASENOTES.html#1.6_r1">Release Notes</a>.</p>
+
+<h2>SDK Contents</h2>
+
+<h4>Development tools</h4>
+
+<p>The SDK includes a full set of tools for developing and debugging application
+code and designing an application UI. You can read about the tools in the <a
+href="{@docRoot}guide/developing/tools/index.html">Dev Guide</a> and access them
+in the <code>&lt;sdk&gt;/tools/</code> directory. 
+
+<p>The tools package in this SDK includes updates from those provided in the
+previous SDK. The tools use the same project structure as in the previous SDK
+(Android 1.5). If you have application projects developed in the Android 1.5
+SDK, you can migrate them to the latest SDK without modification. For more
+information about how to migrate, see <a href="upgrading.html">Upgrading the
+SDK</a>.
+
+<h4 id="system_images">Android Platforms</h4>
+
+<p>This SDK includes multiple Android platform versions that you can use to
+develop applications. For each version, both a fully compliant Android library
+and system image are provided. The table below lists the platform versions
+included in this SDK. For more information about a platform version &mdash;
+features, applications included, localizations, API changes, and so on &mdash;
+see its Version Notes. </p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>Platform</nobr></th><th><nobr>API
+Level</nobr></th><th>Notes</th><th>Description</th>
+</tr>
+<tr>
+<td width="5%"><nobr>Android 1.6</nobr></td>
+<td  width="5%">4</td>
+<td  width="5%"><nobr><a href="{@docRoot}sdk/android-1.6.html">Version
+Notes</a></nobr></td>
+<td>Includes a standard Android 1.6 library and system image with a set of
+development applications. Does not include any external libraries (such as the
+Maps external library).</td>
+</tr>
+<tr>
+<td width="5%"><nobr>Android 1.5</nobr></td>
+<td  width="5%">3</td>
+<td  width="5%"><nobr><a href="{@docRoot}sdk/android-1.5.html">Version
+Notes</a></nobr></td>
+<td>Includes a standard Android 1.5 library and system image with a set of
+development applications. Does not include any external libraries (such as the
+Maps external library).</td>
+</tr>
+</table>
+
+<p>Note that you can use the Android SDK and AVD Manager to download other
+platform versions into your development environment.</span>. 
+
+<h4 id="system_images">SDK Add-Ons</h4>
+
+<p>An SDK add-on provides a development environment for an Android external
+library or a customized (but fully compliant) Android system image. This SDK
+includes the SDK add-ons listed below. The Android system API Level required by
+the add-ons are noted.</p>
+
+<table style="margin-right:1em;" width="80%">
+<tr>
+<th><nobr>Add-On</nobr></th><th><nobr>API Level</nobr></th>
+<th>Notes</th><th>Description</th>
+</tr>
+<tr>
+<td width="5%"><nobr>Google APIs</nobr></td>
+<td  width="5%">4</td>
+<td  width="5%">&nbsp;</td>
+<td>Includes the com.google.android.maps external library, a compliant
+Android 1.6 system image, a {@link android.location.Geocoder Geocoder}
+backend service implementation, documentation, and sample code. </td>
+</tr>
+<tr>
+<td width="5%"><nobr>Google APIs</nobr></td>
+<td  width="5%">3</td>
+<td  width="5%">&nbsp;</td>
+<td>Includes the com.google.android.maps external library, a compliant 
+Android 1.5 system image, a {@link android.location.Geocoder Geocoder}
+backend service implementation, documentation, and sample code. </td>
+</tr>
+</table>
+
+<h4>Sample Code and Applications</h4>
+
+<p>You can look at a variety of tutorials and samples in the <a
+href="{@docRoot}guide/samples/index.html">Dev Guide</a> and access the sample
+code itself in the <code>&lt;sdk&gt;/platforms/&lt;platform&gt;/samples/</code>
+directory of the SDK package. Note the new location &mdash; the SDK now includes
+multiple platform versions that you can develop against and each has its own
+sample code directory. </p>
+
+<p>For example, to view or build the samples available for the Android 
+1.6 platform (AVD target "Android 1.6"), you will find the samples in the
+<code>&lt;sdk&gt;/platforms/android-1.6/samples/</code> directory of the SDK
+package. </p>
+
+<h4>Documentation</h4>
+
+<p>The SDK package includes a full set of local documentation. To view it, open
+the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser. If you
+are developing in an IDE such as Eclipse, you can also view the reference
+documentation directly in the IDE. </p>
+
+<p>The most current documentation is always available on the Android Developers
+site:</p>
+
+<p style="margin-left:2em;"><a
+href="http://developer.android.com/index.html">http://developer.android.com/</a>
+</p>
+
+
diff --git a/docs/html/sdk/1.6_r1/installing.jd b/docs/html/sdk/1.6_r1/installing.jd
new file mode 100644
index 000000000000..954bfa3f0039
--- /dev/null
+++ b/docs/html/sdk/1.6_r1/installing.jd
@@ -0,0 +1,441 @@
+page.title=Installing the Android 1.6 SDK
+sdk.version=1.6
+sdk.preview=0
+
+@jd:body
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#Preparing">Prepare for Installation</a></li>
+    <li><a href="#Installing">Install the SDK</a></li>
+    <li><a href="#InstallingADT">Install the ADT Plugin for Eclipse</a></li>
+    <li><a href="#sdkContents">SDK Contents</a></li>
+    <li><a href="#NextSteps">Next Steps</a></li>
+    <li><a href="#InstallationNotes">Installation Notes</a></li>
+    <li><a href="#Troubleshooting">Troubleshooting ADT Installation</a></li>
+  </ol>
+
+</div>
+</div>
+
+<p>This page describes how to install the Android SDK and set up your
+development environment.</p>
+
+<p>If you encounter any problems during installation, see the 
+<a href="#InstallationNotes">Installation Notes</a> at the bottom of
+this page.</p>
+
+<h4 style="margin-top">Upgrading?</h4>
+<p>If you have already developed applications using an earlier version
+of the Android SDK, please read <a href="upgrading.html">Upgrading the SDK</a>, instead.
+</p>
+
+
+<h2 id="Preparing">Prepare for Installation</h2>
+
+<p>Before you begin, take a moment to confirm that your development machine
+meets the <a href="requirements.html">System Requirements</a>.</p>
+
+<p>If you will be developing on Eclipse with the Android Development
+Tools (ADT) Plugin &mdash; the recommended path if you are new to
+Android &mdash; make sure that you have a suitable version of Eclipse
+installed on your computer (3.4 or newer is recommended). If you need 
+to install Eclipse, you can download it from this location: </p>
+
+<p style="margin-left:2em;"><a href=
+"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a></p>
+
+<p>A Java or RCP version of Eclipse is recommended. </p>
+
+<h2 id="Installing">Install the SDK</h2>
+
+<p>After downloading the Android SDK, unpack the Android SDK .zip archive 
+to a suitable location on your machine. By default, the SDK files are unpacked 
+into a directory named <code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em></code>. </p>
+
+<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you 
+will need to refer to the SDK directory later, when setting up the Android plugin or when 
+using the SDK tools.</p>
+
+<p>Optionally, you may want to add the location of the SDK's primary <code>tools</code> directory 
+to your system <code>PATH</code>. The primary <code>tools/</code> directory is located at the root of the 
+SDK folder. Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and 
+the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without 
+needing to supply the full path to the tools directory. </p>
+<ul>
+    <li>On Linux, edit your <code>~/.bash_profile</code> or <code>~/.bashrc</code> file. Look
+    for a line that sets the PATH environment variable and add the
+    full path to the <code>tools/</code> directory to it. If you don't 
+    see a line setting the path, you can add one:</li>
+
+    <ul><code>export PATH=${PATH}:<em>&lt;your_sdk_dir&gt;</em>/tools</code></ul>
+
+    <li>On a Mac, look in your home directory for <code>.bash_profile</code> and
+    proceed as for Linux. You can create the <code>.bash_profile</code> if 
+    you haven't already set one up on your machine. </li>
+
+    <li>On Windows, right-click on My Computer, and select Properties.  
+  Under the Advanced tab, hit the Environment Variables button, and in the
+  dialog that comes up, double-click on Path (under System Variables). Add the full path to the 
+  <code>tools/</code> directory to the path. </li>
+  </ul>
+
+<p>Note that, if you update your SDK in the future, you 
+should remember to update your <code>PATH</code> settings to point to the new location, if different.</p>
+
+<p>If you will be using the Eclipse IDE as your development environment,
+the next section describes how to install the Android Development Tools (ADT) plugin and set up Eclipse. 
+If you choose not to use Eclipse, you can 
+develop Android applications in an IDE of your choice and then compile, debug and deploy using
+the tools included in the SDK (skip to <a href="#NextSteps">Next Steps</a>).</p>
+
+
+<h2 id="InstallingADT">Install the ADT Plugin for Eclipse</h2>
+
+<p>Android offers a custom plugin for the Eclipse IDE, called Android
+Development Tools (ADT), that is designed to give you a powerful,
+integrated environment in which to build Android applications. It
+extends the capabilites of Eclipse to let you quickly set up new Android
+projects, create an application UI, add components based on the Android
+Framework API, debug your applications using the Android SDK tools, and even export
+signed (or unsigned) APKs in order to distribute your application.</p>
+
+<p>In general, using Eclipse with ADT is a highly recommended approach to
+Android development and is the fastest way to get started. (If you prefer to
+work in an IDE other than Eclipse, you do not need to install Eclipse or ADT,
+instead, you can directly use the SDK tools to build and debug your
+application&mdash;skip to <a href="#NextSteps">Next Steps</a>.)</p>
+
+<p>Once you have the Eclipse IDE installed, as described in <a
+href="#Preparing">Preparing for Installation</a>, follow the steps below to
+download the ADT plugin and install it in your respective Eclipse environment.
+</p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.4 (Ganymede)</th><th>Eclipse 3.5 (Galileo)</th></tr>
+<tr>
+<td width="45%">
+<!-- 3.4 steps -->
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>. 
+        In the dialog that appears, click the <strong>Available Software</strong> tab. </li>
+    <li>Click <strong>Add Site...</strong> </li>
+    <li>In the Add Site dialog that appears, enter this URL in the "Location" field:
+      <pre style="margin-left:0">https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Note: If you have trouble aqcuiring the plugin, try using "http" in the Location URL,
+        instead of "https" (https is preferred for security reasons).</p>   
+      <p>Click <strong>OK</strong>.</p></li>
+    <li>Back in the Available Software view, you should see the plugin listed by the URL,
+    with "Developer Tools" nested within it. Select the checkbox next to 
+      Developer Tools and click <strong>Install...</strong></li>
+    <li>On the subsequent Install window, "Android DDMS" and "Android Development Tools"
+    should both be checked. Click <strong>Next</strong>. </li>
+    <li>Read and accept the license agreement, then click <strong>Finish</strong>.</li>
+    <li>Restart Eclipse. </li>
+</ol>
+
+</td>
+<td>
+<!-- 3.5 steps -->
+<ol>
+    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Install
+        New Softare</strong>. </li>
+    <li>In the Available Software dialog, click <strong>Add...</strong>.</li>
+    <li>In the Add Site dialog that appears, enter a name for the remote site
+        (e.g., "Android Plugin") in the "Name" field. 
+        <p>In the "Location" field, enter this URL:</p>
+        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
+        <p>Note: If you have trouble aqcuiring the plugin, you can try
+           using "http" in the URL, instead of "https" (https is preferred for 
+           security reasons).</p>
+        <p>Click <strong>OK</strong>.</p>
+    </li>
+    <li>Back in the Available Software view, you should now see "Developer
+        Tools" added to the list. Select the checkbox next to Developer Tools, 
+        which will automatically select the nested tools Android DDMS and Android 
+        Development Tools. 
+        Click <strong>Next</strong>. </li>
+    <li>In the resulting Install Details dialog, the Android DDMS and Android 
+        Development Tools features are listed. Click <strong>Next</strong> to 
+        read and accept the license agreement and install any dependencies, 
+        then click <strong>Finish</strong>. </li>
+    <li>Restart Eclipse. </li>
+	
+</ol>
+</td>
+</tr>
+</table>
+
+<p>Now modify your Eclipse preferences to point to the Android SDK directory:</p>
+<ol>
+    <li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
+        panel (Mac: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>).</li>
+    <li>Select <strong>Android</strong> from the left panel. </li>
+    <li>For the <em>SDK Location</em> in the main panel, click <strong>Browse...</strong> and 
+        locate your downloaded SDK directory. </li>
+    <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+
+<p>Done! If you haven't encountered any problems, then you're ready to
+begin developing Android applications. See the 
+<a href="#NextSteps">Next Steps</a> section for suggestions on how to start. </p>
+
+
+<h2 id="sdkContents">Contents of the SDK</h2>
+
+<p>Once you've downloaded and unpacked the SDK, open the SDK directory 
+and take a look at what's inside.
+
+<p>The table below describes the SDK directory contents. </p>
+
+<table>
+<tr>
+<th colspan="3">Name</th><th>Description</th>
+</tr>
+<tr>
+<td colspan="3"><code>add-ons/</code></td>
+<td>Contains add-ons to the Android SDK development
+environment, which let you develop against external libraries that are available on some
+devices. </td>
+</tr>
+<tr>
+<td colspan="3"><code>docs/</code></td>
+<td>A full set of documentation in HTML format, including the Developer's Guide,
+API Reference, and other information.</td>
+</tr>
+<tr>
+<td colspan="3"><code>platforms/</code></td>
+<td>Contains a set of Android platform versions that you can develop
+applications against, each in a separate directory.  </td>
+</tr>
+<tr>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td colspan="2"><code>&lt;platform&gt;/</code></td>
+<td>Platform version directory, for example "Android 1.6". All platform version 
+directories contain a similar set of files and subdirectory structure.</td>
+</tr>
+
+<tr>
+<td style="width:2em;border-bottom-color:white;">&nbsp;</td>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td><code>data/</code></td>
+<td>Storage area for default fonts and resource definitions.</td>
+</tr>
+<tr>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td><code>images/</code></td>
+<td>Storage area for default disk images, including the Android system image, 
+the default userdata image, the default ramdisk image, and more. The images 
+are used in emulator sessions.</td>
+</tr>
+<tr>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td><code>samples/</code></td>
+<td>Contains a wide variety of sample applications that you can load as projects
+into your development environment, compile, and run on the emulator.</td>
+</tr>
+<tr>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td><code>skins/</code></td>
+<td>A set of emulator skins available for the platform version. Each skin is
+designed for a specific screen resolution.</td>
+</tr>
+<tr>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td><code>templates/</code></td>
+<td>Storage area for file templates used by the SDK development tools.</td>
+</tr>
+<tr>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td style="width:2em;border-bottom-color:white;"></td>
+<td><code>tools/</code></td>
+<td>Any development tools that are specific to the platform version.</td>
+</tr>
+<tr>
+<td style="width:2em;"></td>
+<td style="width:2em;"></td>
+<td><code>android.jar</code></td>
+<td>The Android library used when compiling applications against this platform
+version.</td>
+</tr>
+<tr>
+<td colspan="3"><code>tools/</code></td>
+<td>Contains the set of development and profiling tools available to you, such
+as the emulator, the <code>android</code> tool, adb, ddms, and more.</td>
+</tr>
+<tr>
+<td colspan="3"><code>RELEASE_NOTES.html</code></td>
+<td>A file that loads the local version of the SDK release notes, if
+available.</td>
+</tr>
+<tr>
+<td colspan="3"><code>documentation.html</code></td>
+<td>A file that loads the entry page for the local Android SDK
+documentation.</td>
+</tr>
+
+</table>
+
+<h2 id="NextSteps">Next Steps</h2>
+<p>Once you have completed installation, you are ready to
+begin developing applications. Here are a few ways you can get started: </p>
+
+<p><strong>Learn about Android</strong></p>
+<ul>
+  <li>Take a look at the <a href="{@docRoot}guide/index.html">Dev
+  Guide</a> and the types of information it provides</li>
+  <li>Read an introduction to Android as a platform in <a
+  href="{@docRoot}guide/basics/what-is-android.html">What is
+  Android?</a></li>
+  <li>Learn about the Android framework and how applications run on it in
+  <a href="{@docRoot}guide/topics/fundamentals.html">Application
+  Fundamentals</a></li>
+  <li>Take a look at the Android framework API specification in the <a
+  href="{@docRoot}reference/packages.html">Reference</a> tab</li>
+</ul>
+
+<p><strong>Explore the SDK</strong></p>
+<ul>
+  <li>Get an overview of the <a
+  href="{@docRoot}guide/developing/tools/index.html">development
+  tools</a> that are available to you</li>
+  <li>Read how to develop <a
+  href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
+  <a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>
+  </li>
+</ul>
+
+<p><strong>Explore some code</strong></p>
+<ul>
+  <li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello
+  World application</a> (highly recommended, especially for Eclipse users)</li>
+  <li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html">
+  Notepad Tutorial</a> to build a full Android application </li>
+  <li>Create a new project for one of the other sample applications
+  included in <code><em>&lt;sdk&gt;</em>/platforms/<em>&lt;platform&gt;</em>/samples</code>, 
+  then compile and run it in your development environment</li>
+</ul>
+
+<p><strong>Visit the Android developer groups</strong></p>
+<ul>
+  <li>Take a look at the <a
+  href="{@docRoot}community/index.html">Community</a> tab to see a list of
+  Android developers groups. In particular, you might want to look at the
+  <a href="http://groups.google.com/group/android-developers">Android
+  Developers</a> group to get a sense for what the Android developer
+  community is like.</li>
+</ul>
+
+
+<h2 id="InstallationNotes">Installation Notes</h2>
+
+<h3>Ubuntu Linux Notes</h3>
+
+<ul>
+  <li>If you need help installing and configuring Java on your
+    development machine, you might find these resources helpful: 
+    <ul>
+      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
+      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation</a></li>
+    </ul>
+  </li>
+  <li>Here are the steps to install Java and Eclipse, prior to installing
+  the Android SDK and ADT Plugin.
+    <ol>
+      <li>If you are running a 64-bit distribution on your development
+      machine, you need to install the <code>ia32-libs</code> package using
+      <code>apt-get:</code>:
+      <pre>apt-get install ia32-libs</pre>
+      </li>
+      <li>Next, install Java: <pre>apt-get install sun-java6-bin</pre></li>
+      <li>The Ubuntu package manager does not currently offer an Eclipse 3.3
+      version for download, so we recommend that you download Eclipse from
+      eclipse.org (<a
+      href="http://www.eclipse.org/downloads/">http://www.eclipse.org/
+      downloads/</a>). A Java or RCP version of Eclipse is recommended.</li>
+      <li>Follow the steps given in previous sections to install the SDK 
+      and the ADT plugin. </li>
+    </ol>
+  </li>
+</ul>
+
+<h3>Other Linux Notes</h3>
+
+<ul>
+  <li>If JDK is already installed on your development computer, please
+  take a moment to make sure that it meets the version requirements listed
+  in the <a href="requirements.html">System Requirements</a>.
+  In particular, note that some Linux distributions may include JDK 1.4 or Gnu
+  Compiler for Java, both of which are not supported for Android development.</li>
+</ul>
+
+
+<h2 id="Troubleshooting">Troubleshooting ADT Installation</h2>
+
+<p> If you are having trouble downloading the ADT plugin after following the
+steps above, here are some suggestions: </p>
+
+<ul>
+  <li>If Eclipse can not find the remote update site containing the ADT plugin,
+try changing the remote site URL to use http, rather than https. That is, set
+the Location for the remote site to:
+<pre>http://dl-ssl.google.com/android/eclipse/</pre></li> 
+<li>If you are behind a firewall (such as a corporate firewall), make sure that
+you have properly configured your proxy settings in Eclipse. In Eclipse 3.3/3.4,
+you can configure proxy information from the main Eclipse menu in
+<strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt;
+<strong>Preferences</strong> &gt; <strong>General</strong> &gt; <strong>Network
+Connections</strong>.</li>
+</ul>
+
+<p> If you are still unable to use Eclipse to download the ADT plugin as a
+remote update site, you can download the ADT zip file to your local machine and
+manually install it:</p>
+
+<ol>
+  <li><a href="http://developer.android.com/sdk/preview/index.html">Download the
+      ADT Plugin zip file</a> (do not unpack it).</li>
+  <li>Follow steps 1 and 2 in the <a href="#InstallingADT">default install 
+      instructions</a> (above).</li>
+  <li>In the Add Site dialog, click <strong>Archive</strong>.</li>
+  <li>Browse and select the downloaded zip file.</li>
+  <li>In Eclipse 3.5 only, enter a name for the local update site (e.g.,
+      "Android Plugin") in the "Name" field.</li>
+  <li>Click <strong>OK</strong>.
+  <li>Follow the remaining procedures as listed for 
+      <a href="#InstallingADT">default installation</a> above,
+      starting from step 4.</li>
+</ol>
+
+<p>To update your plugin once you've installed using the zip file, you will have
+to follow these steps again instead of the default update instructions.</p>
+
+<h4>Other install errors</h4>
+
+<p>Note that there are features of ADT that require some optional 
+Eclipse components (for example, WST). If you encounter an error when 
+installing ADT, your Eclipse installion might not include these components. 
+For information about how to quickly add the necessary components to your 
+Eclipse installation, see the troubleshooting topic 
+<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT 
+Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
+
+<h4>For Linux users</h4>
+<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
+<pre>
+An error occurred during provisioning.
+Cannot connect to keystore.
+JKS</pre>
+<p>
+...then your development machine lacks a suitable Java VM. Installing Sun
+Java 6 will resolve this issue and you can then reinstall the ADT
+Plugin.</p>
+
+
diff --git a/docs/html/sdk/1.6_r1/requirements.jd b/docs/html/sdk/1.6_r1/requirements.jd
new file mode 100644
index 000000000000..781ee3278ded
--- /dev/null
+++ b/docs/html/sdk/1.6_r1/requirements.jd
@@ -0,0 +1,51 @@
+page.title=System Requirements
+sdk.version=1.6
+sdk.preview=0
+@jd:body
+
+<p>The sections below describe the system and software requirements for developing 
+Android applications using the Android SDK tools included in Android 
+<?cs var:sdk.version ?> SDK<?cs if:sdk.rel.id ?>, Release <?cs var:sdk.rel.id ?><?cs /if ?>. </p>
+
+<h3>Supported Operating Systems</h3>
+<ul>
+  <li>Windows XP (32-bit) or Vista (32- or 64-bit)</li>
+  <li>Mac OS X 10.4.8 or later (x86 only)</li>
+  <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
+</ul>
+
+<h3>Supported Development Environments</h3>
+<ul>
+  <li>Eclipse IDE
+    <ul>
+      <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.4 (Ganymede) or 3.5 (Galileo)
+        <ul>
+        <li>Note: Eclipse 3.3 has not been fully tested with ADT 0.9.3 and support can no longer be guaranteed. We suggest you upgrade to 
+          Eclipse 3.4 or 3.5.</li>
+        <li>Recommended Eclipse IDE packages: Eclipse IDE for Java EE Developers, Eclipse IDE for Java Developers, Eclipse for RCP/Plug-in Developers</li>
+        <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
+        <li>Eclipse Classic IDE package is not supported.</li>
+        </ul>
+      </li>     
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+  <li>Other development environments or IDEs
+    <ul>
+      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
+      <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
+      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+    </ul>
+  </li>
+</ul>
+
+<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
+particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p>
+
+<h3>Hardware requirements</h3>
+<ul>
+  <li>For the base SDK package, at least 600MB of available disk space. For each platform downloaded into the SDK, an additional 100MB is needed. </li>
+</ul>
+
diff --git a/docs/html/sdk/1.6_r1/upgrading.jd b/docs/html/sdk/1.6_r1/upgrading.jd
new file mode 100644
index 000000000000..2f9cc7308f84
--- /dev/null
+++ b/docs/html/sdk/1.6_r1/upgrading.jd
@@ -0,0 +1,386 @@
+page.title=Upgrading the SDK
+sdk.version=1.6
+sdk.preview=0
+@jd:body
+
+
+<div id="qv-wrapper">
+<div id="qv">
+
+  <h2>Upgrading the SDK</h2>
+  <ul>
+    <li>If you are developing on the Android 1.5 SDK, migrating your
+applications is straightforward and typically requires no modifications.</li>
+    <li>For Eclipse users, a new version of ADT is available. To use the Android
+1.6 SDK, please upgrade to ADT 0.9.3 (or later).</li>
+    <li>For Windows users, the SDK includes a new USB driver that you can
+install, if you are developing on a device. </li>
+    <li>A new Android SDK and AVD Manager tool is available. To access 
+it, run the <code>android</code> tool without options. </li>
+  </ul>
+
+  <h2>In this document</h2>
+  <ol>
+    <li><a href="#Install">Install the SDK</a></li>
+    <li><a href="#UpdateAdt">Update Your Eclipse ADT Plugin</a></li>
+    <li><a href="#RunYourApps">Run Your Applications</a></li>
+    <li><a href="#MigrateYourApps">Migrate Your Applications</a></li>
+  </ol>
+  
+  <h2>Migrating information</h2>
+  <ol>
+    <li><a href="{@docRoot}sdk/api_diff/4/changes.html">Android 1.6 API 
+Differences</a></li>
+  </ol>
+
+</div>
+</div>
+
+<p>This document describes how to move your development environment and existing
+Android applications from an Android 1.5 SDK to the Android 1.6 SDK. If you are
+migrating applications from an SDK older than 1.5, please also read the
+upgrading document available in the Android 1.5 SDK package.</p>
+
+<p>There are several compelling reasons to upgrade, such as new SDK tools that
+make developing more efficient and new APIs that allow you to expand the
+feature-set of your applications. However, even if you or your applications
+don't require these enhancements, it's important that you upgrade to ensure that
+your applications run properly on the upcoming Android platform.</p>
+
+<p>The Android 1.6 platform will soon be deployable to devices around the world.
+If you have already released Android applications to the public, you should test
+the forward-compatibility of your applications on the latest version of the
+platform as soon as possible. It's unlikely that you'll encounter problems in
+your applications, but in the interest of maintaining the best user experience,
+you should take no risks. So, please install the new Android SDK and test your
+applications on the new platform.</p>
+
+<!-- NOT AVAILABLE FOR PREVIEW RELEASES -->
+<p>For more information on new SDK features and system changes, 
+see the <a href="{@docRoot}sdk/android-1.6.html">Android 1.6 Version Notes</a>.</p>
+<!-- -->
+
+<h2 id="Install">Install the SDK</h2>
+
+<p>If you haven't yet downloaded the SDK, <a href="index.html">download it from 
+here</a> and unpack it into a safe location.</p>
+
+<p>If you had previously setup your <code>PATH</code> variable to point to the SDK 
+tools directory, then you need to update it to point to the new SDK. For example, for
+a <code>.bashrc</code> or <code>.bash_profile</code> file:</p>
+<pre>export PATH=$PATH:<em>&lt;your_sdk_dir></em>/tools</pre>
+
+
+<h2 id="UpdateAdt">Update Your Eclipse ADT Plugin</h2>
+
+<p>If you don't use the Eclipse IDE for development,
+skip to <a href="#RunYourApps">Run Your Applications</a>.</p>
+
+<p>A new version of the ADT Plugin, ADT 0.9.3, is available in conjunction with
+this SDK release. To use the SDK, you must upgrade your ADT Plugin to version
+0.9.3. With ADT 0.9.3, you can still compile your existing applications against 
+multiple platform versions, such as Android 1.5, Android 1.1, and so on. However, 
+ADT 0.9.3 is not compatible with previous versions of the SDK and its tools, so 
+make sure that you upgrade both your SDK <em>and</em> the ADT Plugin.</p>
+
+The upgrade steps for ADT are described below. For information about new features in ADT, see the <a
+href="{@docRoot}sdk/RELEASENOTES.html">Release Notes</a> document. </p>
+
+<p>If you're currently using a version of ADT <em>older</em> than version 0.9,
+then you must uninstall ADT before you proceed (read how to <a
+href="{@docRoot}sdk/1.5_r3/upgrading.html#uninstallAdt">Uninstall your previous
+ADT plugin</a>). If you currently have version 0.9 or 0.9.1, then you don't need
+to uninstall and can continue with the procedure below.</p>
+
+<table style="font-size:100%">
+<tr><th>Eclipse 3.4 (Ganymede)</th><th>Eclipse 3.5 (Galileo)</th></tr>
+<tr>
+<td width="50%">
+<!-- 3.4 steps -->
+<ol>
+    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong>.</li>
+    <li>Select the <strong>Available Software</strong> tab.</li>
+    <li>Select the checkboxes next to Android DDMS and Android Developer Tools, 
+      then click  <strong>Update</strong>.</li>
+    <li>In the resulting Available Updates dialog, ensure that both Android DDMS 
+      and Android Development Tools are selected, then click 
+      <strong>Next</strong>.</li>
+    <li>Read and accept the license agreement and then click <strong>Finish</strong>.
+      This will download and install the latest version of Android DDMS and 
+      Android Development Tools.</li>
+    <li>Restart Eclipse.</li>
+</ol>
+</td>
+<td>
+<!-- 3.5 steps -->
+<ol>
+    <li>Select <strong>Help</strong> &gt; <strong>Check for Updates</strong>. </li>
+    <li>In the resulting Available Updates dialog, locate the Android DDMS and 
+        Android Development Tools features in the list and ensure that the checkboxes
+        next to them are selected. Click <strong>Next</strong>. 
+        <p>If the Available Updates dialog does not list Android DDMS and Android 
+           Development tools, make sure that you have set up a remote update site 
+           for them, as described in 
+           <a href="installing.html#InstallingADT">Installing the ADT Plugin</a>. 
+        </p></li>
+    <li>In the Update Details dialog, click <strong>Next</strong>.</li>
+    <li>Read and accept the license agreement and then click <strong>Finish</strong>.
+      This will download and install the latest version of Android DDMS and 
+      Android Development Tools.</li>
+    <li>Restart Eclipse.</li>
+</ol>
+</td>
+</tr>
+</table>
+
+<p>If you encounter problems with this update procedure, try performing a fresh
+installation. Fully remove your existing ADT Plugin as described in <a
+href="{@docRoot}sdk/1.5_r3/upgrading.html#uninstallAdt">Uninstall your previous
+ADT plugin</a> and then follow the guide to <a
+href="installing.html#InstallingADT">Installing the ADT Plugin for
+Eclipse</a>.</p>
+
+<h3 id="updateEclipsePrefs">Update your Eclipse SDK Preferences</h3>
+
+<p>The last step is to update your Eclipse preferences to point to the new 
+SDK directory:</p>
+<ol>
+  <li>Select <strong>Window</strong> > <strong>Preferences</strong> to open 
+      the Preferences panel (Mac: <strong>Eclipse</strong> > <strong>Preferences
+      </strong>).</li>
+  <li>Select <strong>Android</strong> from the left panel.</li>
+  <li>For the SDK Location, click <strong>Browse</strong> 
+  and locate your SDK directory.</li>
+  <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+
+
+<h2 id="RunYourApps">Run Your Applications to Test Forward Compatibility</h2>
+
+<p>Now that you have installed the Android 1.6 SDK, we encourage you run each of
+your existing applications on the Android 1.6 system image that is included in
+the SDK, to ensure that it functions properly on the new platform.
+Testing forward-compatibility in this way is especially important for
+applications that you may have already published and that may be installed on
+devices that will upgrade to the new platform. </p>
+
+<p>In most cases, your applications will function properly when run on the new
+version of the platform. However, it is possible that you will encounter
+unexpected behavior, because of changes in the API or underlying platform. If
+you do find problems, you can use the SDK tools to compile and publish an update
+to the applications, which users can then download. 
+
+<p>To test forward-compatibility, simply run your application, as-is, on an
+instance of the Android Emulator that uses an AVD targeted to the "Android 1.6"
+system image. Here are the steps: </p>
+
+<ol>
+  <li>Make no changes to your application code.</li>
+  <li>Create a new AVD that runs the new "Android 1.6" platform. </li>
+  <li>Launch your application in an emulator running the new AVD.</li>
+  <li>Perform normal testing on your application to ensure everything works as 
+      expected.</li>
+</ol>
+
+<p>Note that, for the purposes of forward-compatibility testing, you should not
+change how your application is compiled. That is, you should continue to compile
+the application against the same version of the Android library as before. The
+only change needed is to the AVD, which controls the version of the Android
+system image (run-time environment) on which the application is run. 
+
+<p>For more information on creating an AVD and launching your application, see
+<a href="{@docRoot}guide/developing/eclipse-adt.html#Running">Running Your
+Applications (Eclipse)</a> or <a
+href="{@docRoot}guide/developing/other-ide.html#Running">Running
+Your Applications (other IDEs)</a>, depending on your development
+environment.</p>
+
+<h3 id="FutureProofYourApps">Android 1.6 Forward-Compatibility Tips</h3>
+
+<p>The new version of the Android platform includes several new APIs, but
+very few actual changes to existing APIs. This means that, in most
+cases, your applications written with earlier versions of the Android library
+should run properly on the Android 1.6 platform. </p>
+
+<p>However, here are some areas to pay attention to as you test forward-compatibility:</p>
+
+<ul>
+  <li><strong>Make sure your application doesn't use internal APIs</strong>. Your
+application should not use any APIs that are not officially supported and are
+not published in the Android reference documentation. Unofficial APIs can change
+at any time without notice and &mdash; if your application happens to be using
+them &mdash; such a change could cause the application to break.</li>
+
+ <li><strong>Watch for assumptions about available hardware</strong>. Remember
+that not all compatible devices offer the same hardware capabilities &mdash;
+screens, keyboards, and physical keys, and so on. As you test your application,
+watch for areas where your application depends on the presence of specific
+hardware capabilities. If you find dependencies, you can design around them by
+building in alternate support or graceful degradation, or you can specify them 
+as hardware requirements in a 
+<a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><code>&lt;uses-configuration&gt;</code>.</a>
+element in the application's manifest file. Also see the <a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><code>&lt;uses-feature&gt;</code>
+manifest element, which lets your application declare a requirement for 
+specific features, such as an OpenGL ES version or a camera that has 
+autofocus capability.
+</li>
+
+ <li><strong>Watch for assumptions about available features</strong>. Not all 
+compatible devices offer equal support for embedded features. same hardware capabilities &mdash;
+screens, keyboards, and physical keys, and so on. As you test your application,
+watch for areas where your application depends on the presence of specific
+hardware capabilities. If you find dependencies, you can design around them by
+building in alternate support or graceful degradation, or you can specify them 
+as hardware requirements in a 
+<a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><code>&lt;uses-configuration&gt;</code>.</a>
+element in the application's manifest file. </li>
+
+  <p>When testing forward-compatibility, try running your application in various
+AVDs that emulate different hardware configurations. For example, you can create
+an AVD that does not offer a physical keyboard or one that uses a dpad instead
+of a trackball. Running your application in different emulated hardware
+configurations will give you an idea of where its dependencies are and help you
+identify problems. </p>
+ </li>
+
+  <li><strong>Watch for assumptions about screen resolution and
+density</strong>. A device's screen resolution and density is likely to affect
+the way that your application's UI is rendered, especially if your app specifies
+dimensions or positions using pixels or absolute layouts. To ensure consistent
+UI across screens, your app should specify the dimensions and positions of
+layouts and drawables in relative units that can be scaled by the system as
+appropriate, according to the density of the device's screen. Alternatively, you
+can create custom sets of layout/drawable resources for specific screens, which
+the system can then load as appropriate, based on the current device screen.</p>
+
+  <p>When testing forward-compatibility, try running your application in various
+AVDs that emulate different screen resolutions and densities. Also note that,
+starting with Android 1.6, the platform provides a Compatibility Mode that
+automatically scales the UI of applications if they do not explicitly indicate
+support for the current screen in the 
+<a href="{@docRoot}guide/topics/manifest/supports-screen-element.html"><code>&lt;supports-screen&gt;</code>
+element in their manifest files. As part of testing, you should evaluate how
+your application is displayed in Compatibility Mode on different screens. </p>
+  </li>
+
+  <li><strong>Avoid performing layout orientation changes based on the
+acceletometer (or via other sensors)</strong>. Some Android-powered devices will
+automatically rotate the orientation (and all devices have the option to turn on
+auto-rotation), so if your application also attempts to rotate the orientation,
+it can result in strange behavior. In addition, if your application uses the
+accelerometer to detect shaking and you do not want to rotate the orientation,
+then you should lock the current orientation with <a
+href="{@docRoot}guide/topics/manifest/activity-element.html#screen">android:screenOrientation</a>.
+ </li>
+
+</ul>
+
+<h2 id="MigrateYourApps">Migrate Your Applications</h2>
+
+<p>If you want to use any of the new Android 1.6 APIs in your existing
+applications, you must first migrate the applications to the new Android
+platform version. Generally, migrating an application includes: </p>
+
+<ul>
+<li>Referencing the proper API Level in the application's manifest file, 
+and</li>
+<li>Resetting its project properties so that it is compiled against the Android 
+1.6 build target.</li>
+</ul>
+
+<p>Additionally, to run your application in the emulator, you need to
+create an AVD that uses the Android 1.6 system image. </p>
+
+<p class="note"><strong>Note:</strong> You only need migrate your application as
+described in this section if the application will actually use APIs
+<em>introduced</em> in the Android 1.6 platform (which are not available on
+devices running older versions of the Android platform). If your application
+does not use any new APIs, you can compile and run it without modification and
+not migration is necessary.</p>
+
+<h3>Reference the Proper API Level</h3>
+
+<p>If your application is using APIs introduced in Android 1.6, you must
+reference that dependency in the application's manifest file so that it can be
+deployed to devices running the Android 1.6 platform. </p>
+
+<p>Open the manifest file and locate the <code>minSdkVersion</code> attribute 
+in the <code>&lt;uses-sdk&gt;</code> manifest element. Set the value of 
+<code>minSdkVersion</code> to <code>"4"</code> (the API Level
+identifier corresponding to Android 1.6). Here's an example:</p>
+
+<pre>
+&lt;manifest>
+  ...
+  &lt;uses-sdk android:minSdkVersion="4" />
+  ...
+&lt;/manifest>
+</pre>
+
+<h3>Compile Against the Proper Build Target</h3>
+
+<p>Once you've changed the <code>minSdkVersion</code> value in your
+application's manifest, you need to set the application's project properties so
+that the application will be compiled against the Android 1.6 library. To do so,
+follow the steps below for your respective development environment.  </p>
+
+<h4 id="EclipseUsers">Eclipse Users</h4>
+
+<ol>
+  <li>Right-click on the individual project (in the Package Explorer)
+  and select <strong>Properties</strong>.</li>
+  <li>In the properties, open the Android panel and select a new Project Build Target.
+  Select "Android 1.6" to target the new platform (or "Google APIs" with the "4" 
+  API Level, if your application uses the Google Maps APIs).</li>
+  <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
+</ol>
+	
+<h4 id="AntUsers">Ant Users</h4>
+	
+<p>Use the <code>android</code> tool (located in
+<code><em>your_sdk</em>/tools/</code>) to create a new <code>build.xml</code>
+that references the new platform target. To see a list of available targets,
+execute:</p>
+
+<pre>android list targets</pre>
+
+<p>Select the target <code>id</code> that corresponds to the "Android 1.6" platform
+and pass it with the <code>--target</code> parameter when updating your project.
+For example:</p>
+
+<pre>android update project --path /path/to/my-project --target 2</pre>
+
+<p>If your application uses the Google Maps APIs (i.e., MapView), be certain to 
+select a Google APIs target.</p>
+
+<h3>Create an AVD that Uses the Android 1.6 Platform</h3>
+
+<p>Finally, you need to set up a new AVD that uses the Android 1.6 platform, so that 
+you can run your application in the emulator. 
+
+<p>To set up the new AVD, use the <code>android</code> tool, available in the
+<code>tools/</code> directory of the SDK. You can run the AVD manager by simply
+changing to the <code>tools/</code> directory and entering <code>android</code>
+at the command line. Click "New" to create the AVD and set its properties.</p>
+
+<p>When creating the AVD, make sure to select a target of "Android 1.6 - API
+Level 4". If your application uses the Google Maps APIs (MapView), select the
+target "Google APIs (Google Inc.) - API Level 4". </p>
+
+<p>For more information about running your application in an AVD, see <a
+href="{@docRoot}guide/developing/eclipse-adt.html#Running">Running Your
+Application (Eclipse)</a> or <a
+href="{@docRoot}guide/developing/other-ide.html#Running">Running Your
+Application (other IDEs)</a>. </p>
+
+<p>For general information about AVDs, see the <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual
+Devices</a> document. </p>
+
+
+
+<div class="special">
+<p>If you have trouble migrating to the new version of the SDK, visit the 
+<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
+to seek help from other Android developers.</p>
+</div>
+
diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd
index 03eeb4bb8ddb..130a92c32fb0 100644
--- a/docs/html/sdk/RELEASENOTES.jd
+++ b/docs/html/sdk/RELEASENOTES.jd
@@ -5,6 +5,198 @@ page.title=SDK Release Notes
 releases. For the latest known issues, please ensure that you're viewing this
 page at <a href="http://developer.android.com/sdk/RELEASENOTES.html">http://developer.android.com/sdk/RELEASENOTES.html</a>.</p>
 
+<h2 id="1.6_r1">Android 1.6 SDK, Release 1</h2>
+
+<p>This SDK provides updates to the development tools and Android system that
+you use to create applications for compliant Android-powered devices. </p>
+
+<h3>Release Overview</h3>
+
+<p>This SDK release includes several new features for developers. Highlights of the
+changes include: </p>
+
+  <ul>
+    <li>Emulator support for multiple screen sizes/densities, including new
+skins. </li>
+    <li>Android SDK and AVD Manager, a graphical UI to let you manage your
+SDK and AVD environments more easily. The tool lets you create and manage 
+your <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual
+Devices</a> and download new SDK packages (such as platform versions and 
+add-ons) into your environment.</li>
+    <li>Improved support for test packages in New Project Wizard</li>
+  </ul>
+
+<p>For details about the Android platforms included in the SDK &mdash; including
+bug fixes, features, and API changes &mdash; please read the Version Notes
+documents available at left. For a list of Android platforms included in this
+release, see the <a href="{@docRoot}sdk/1.6_r1/index.html">Download
+page</a>. Note that you can use the Android SDK and AVD Manager to download 
+additional platforms.</p>
+
+<h3>Installation and Upgrade Notes</h3>
+
+<p>If you've been developing an application using an Android 1.1 SDK, you need
+to make a few changes to your development environment to migrate to the new SDK.
+Tools and documentation are provided to assist you. No changes to the source
+code of an existing application should be needed, provided that your application
+is not using Android internal structures or APIs.</p>
+
+<p>To ensure that your existing application will work properly on a device
+running the latest version of the Android platform, you are strongly encouraged
+to migrate the application to the new SDK, compile it using the platform
+matching the application's original API Level, and run it against the most
+current platform. </p>
+
+<p>If you're installing the Android SDK for the first time, please see
+the instructions in <a
+href="{@docRoot}sdk/1.5_r1/installing.html">Installing the SDK</a>.
+
+<h3>ADT Plugin for Eclipse</h3>
+
+<p>An updated version of the ADT Plugin for Eclipse is available with the
+Android 1.6 SDK. The new version, ADT 0.9.3, provides several new
+features, including integrated support for the Android SDK and AVD Manager
+and zipalign tool. In addition, the New Project Wizard now
+lets you create a test package containing tests for your application. These
+features are described in the sections below. </p>
+
+<p>If you are developing in Eclipse with ADT and want to get started with the
+Android 1.6 SDK, you should download and install a compatible version of the ADT
+Plugin (0.9.3 or higher). </p>
+
+<p>The new version of ADT is downloadable from the usual remote update site or
+is separately downloadable as a .zip archive. For instructions on how to
+download the plugin, please see <a href="upgrading.html#UpdateAdt">Upgrading
+Your Eclipse Plugin</a>. </p>
+
+<h3>Android SDK and AVD Manager</h3>
+
+<p>The SDK offers a new tool called Android AVD Manager that lets you manage
+your SDK and AVD environments more efficiently. </p>
+
+<p>Using the tool, you can quickly check what Android platforms, add-ons,
+extras, and documentation packages are available in your SDK environment, what
+their versions are, and whether updated versions are available. You can then
+download one or more items from remote repositories and install them directly in
+your SDK environment. For example, the tool lets you obtain updates to SDK tools
+incrementally, as they are made available, without having to wait for the next
+SDK release. You can also download Android platform versions into your
+environment that were not included in the SDK package.</p>
+
+<p>The tool also lets you quickly create new AVDs, manage
+their properties, and run a target AVD from a single window. </p>
+
+<p>If you are developing in Eclipse with ADT, you can access the Android SDK 
+and AVD Manager from the <strong>Window</strong> menu. </p>
+
+<p>If you are developing in another IDE, you can access the Android SDK and 
+AVD Manager through the <code>android</code> command-line tool, located in the
+&lt;sdk&gt;/tools directory. You can launch the tool with a graphical UI by
+using the <code>android</code> command without specifying any options. You can
+also simply double-click the android.bat (Windows) or android (OS X/Linux) file.
+You can still use <code>android</code> commands to create and manage AVDs, 
+including AVDs with custom hardware configurations.</p>
+
+<h3>Integration with zipalign</h3>
+
+<p>The Android system offers a performance optimization for installed
+application packages whose contained uncompressed files are all aligned on
+4-byte boundaries. For these .apks, the system can read the files by mmap'ing
+the zip file, rather than by copying all the data out of them. This reduces
+the amount of memory used by the application at run time. The SDK includes
+a tool called <code>zipalign</code> that you can run against your .apks, to
+align them properly and enable them to benefit from this optimization.</p>
+
+<p>The ADT Plugin and the Ant build tools both provide integrated support for
+aligning your application packages. After you build an .apk, the SDK tools can
+sign and then run <code>zipalign</code> against it. The SDK includes the
+standalone version of the <code>zipalign</code> tool, so you can run also run it
+manually from the command line if you choose. </p>
+
+<ul>
+  <li>If you are developing in Eclipse with ADT, support for
+<code>zipalign</code> is integrated into the Export Wizard. When you use the
+Wizard to export a signed application package, ADT signs and then automatically
+runs <code>zipalign</code> against the exported package. If you use the Wizard 
+to export an unsigned application package, then it will not zipalign the 
+package because zipalign must be performed only after the APK has been signed. 
+You must manually sign and zipalign the package after export. </li>
+  <li>If you are developing using Ant and are compiling in release mode, the
+build tools will automatically sign and then <code>zipalign</code> the
+application package, provided that you have specified the location of a valid
+keystore in the build properties file. If you are compiling in debug mode, the
+build tools will sign the package with the debug key and then <code>zipalign</code>
+it.</li>
+  <li>To use <code>zipalign</code> manually, change to the SDK tools directory
+and use the command syntax <code>$ zipalign 4 &lt;infile&gt;
+&lt;outfile&gt;</code></li>
+</ul>
+
+<p>In general, note that you must <code>zipalign</code> an application only
+<em>after</em> it has been signed, as signing will disrupt the package
+alignment.</p>
+
+<h3>Support for Test Packages in New Project Wizard</h3>
+
+<p>The New Project Wizard available in the ADT 0.9.3 now lets you add a test
+package containing Instrumentation or other classes of tests while you are 
+creating or importing a new Android application project. </p>
+
+<h3>New USB Driver for Windows</h3>
+
+<p>If you are using Windows and want to develop or test your application on an
+Android-powered device (such as the T-Mobile G1), you need an appropriate USB
+driver. 
+
+<p>The Windows version of the Android 1.6 SDK includes a new, WinUSB-based
+driver that you can install. The driver is compatible with both 32- and 64-bit
+versions of Windows XP and Vista. The driver represents an upgrade from the USB
+driver included in previous Android SDKs, although installing the new driver is
+not required. </p>
+
+<p>If you installed the USB driver from a previous SDK release and it is working
+properly, you do not need to upgrade to the new driver. However, we recommend
+upgrading if you have had any problems with the older driver or simply want
+to upgrade to the latest version.</p>
+
+<p>The USB driver files are located in the
+<code>&lt;SDK&gt;/usb_driver</code> directory. For driver installation or
+upgrade instructions, see  <a
+href="{@docRoot}guide/developing/device.html#WinUsbDriver">Installing the WinUSB
+Driver</a>.</p>
+</p>
+
+<h3>Emulator Skins, Android 1.6 Platform</h3>
+
+<p>The Android 1.6 platform included in the SDK provides a new set of emulator
+skins, including: </p>
+
+<ul>
+  <li>QVGA &mdash; 240 x 320, low density (120 dpi)</li>
+  <li>HVGA &mdash; 320 x 480, medium density (160 dpi)</li>
+  <li>WVGA800  &mdash; 480 x 800, high density (240 dpi)</li>
+  <li>WVGA854  &mdash; 480 x 854, high density (240 dpi)</li>
+</ul>
+
+<p>Besides these defaults, You can also create an AVD that overrides the default
+density for each skin, to create any combination of resolution/density (WVGA
+with medium density, for instance).  To do so, use the <code>android</code> tool
+command line to create a new AVD that uses a custom hardare configuration. See
+<a href="{@docRoot}guide/developing/tools/avd.html#createavd">Creating an
+AVD</a> for more information.</p>
+
+<h3>Other Notes and Resolved Issues</h3>
+
+<ul>
+  <li>This SDK release adds support for Eclipse 3.5 (Galileo) and deprecates
+support for Eclipse 3.3 (Europa). </li>
+  <li>We regret to inform developers that Android 1.6 will not include support
+for <a href="http://www.ietf.org/rfc/rfc2549">RFC 2549</a></li>
+  <li>The issue preventing adb from recognizing Samsung Galaxy devices (linux SDK
+only) has been fixed.</li>
+</ul>
+
+
 <h2 id="1.5_r3">Android 1.5 SDK, Release 3</h2>
 
 <p>Provides an updated Android 1.5 system image that includes permissions
diff --git a/docs/html/sdk/adt_download.jd b/docs/html/sdk/adt_download.jd
index d7b9ac328082..3eb68316d103 100644
--- a/docs/html/sdk/adt_download.jd
+++ b/docs/html/sdk/adt_download.jd
@@ -26,24 +26,24 @@ page</a>.
   </tr>
 
   <tr>
-     <td>0.9.2</td>
-     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.2.zip">ADT-0.9.2.zip</a></td>
+     <td>0.9.3</td>
+     <td><a href="http://dl-ssl.google.com/android/ADT-0.9.3.zip">ADT-0.9.3.zip</a></td>
      <td><nobr>bytes</nobr></td>
      <td><nobr></nobr></td>
-     <td><nobr>Required for users of Android 1.6 SDK (and later releases). Updated from 0.9.1. <em><nobr>August 2009</nobr></em></td>
+     <td><nobr>Required for users of Android 1.6 SDK (and later releases). Updated from 0.9.1. <em><nobr>September 2009</nobr></em></td>
   </tr>
   <tr class="alt-color">
      <td>0.9.1</td>
      <td><a href="http://dl-ssl.google.com/android/ADT-0.9.1.zip">ADT-0.9.1.zip</a></td>
      <td><nobr>2916093 bytes</nobr></td>
      <td><nobr>e7b2ab40414ac98</nobr></td>
-     <td><nobr>Required for users of Android 1.5 SDK (and later releases). Updated from 0.9.0. <em><nobr>6 May 2009</nobr></em></td>
+     <td><nobr>Required for users of Android 1.5 SDK. Updated from 0.9.0. <em><nobr>6 May 2009</nobr></em></td>
   </tr>
   <tr>
      <td>0.8.0</td>
      <td><a href="http://dl-ssl.google.com/android/ADT-0.8.0.zip">ADT-0.8.0.zip</a></td>
      <td colspan="2"><nobr>&nbsp;</nobr></td>
-     <td><nobr>Required for users of Android 1.1 SDK and Android 1.0 SDK. <em><nobr>23 Sep 2008</nobr></em></td>
+     <td><nobr>Required for users of Android 1.0/1.1 SDKs. <em><nobr>23 Sep 2008</nobr></em></td>
   </tr>
 </table>
 
@@ -63,20 +63,19 @@ Feature ID column and look at its version number.</p>
 
   <tr>
      <td>0.7.1</td>
-     <td>Required for users of Android 0.9 SDK beta. As of this version, <b>Eclipse 3.2 is no longer supported.</b>
-     Please upgrade to Eclipse Ganymede (3.4) or Europa (3.3) if you are still using 3.2. <em><nobr>18 Aug 2008</nobr></em></td>
+     <td>Required for users of the Android 0.9 SDK beta. <em><nobr>18 Aug 2008</nobr></em></td>
   </tr>
   <tr>
      <td>0.4.0</td>
-     <td>Required if you are using the M5 SDK. See the SDK Release Notes for details on changes and enhancements in this version. <em><nobr>12 Feb 2008</nobr></em></td>
+     <td>Required for users of the Android M5 Early Look SDK. <em><nobr>12 Feb 2008</nobr></em></td>
   </tr>
   <tr>
      <td>0.3.3</td>
-     <td>Some significant enhancements (see m3-rc37 SDK Release Notes). <em><nobr>14 Dec 2007</nobr></em></td>
+     <td>Required for users of the Android M3-RC37 Early Look SDK. <em><nobr>14 Dec 2007</nobr></em></td>
   </tr>
   <tr>
      <td>0.3.1</td>
-     <td>Initial Release. Required for Android m3-rc20 SDK and Android m3-rc22 SDK.<em><nobr>21 Nov 2007</nobr></em></td>
+     <td>Initial Release. Required for users of the Android M3-RC20/22 SDKs.<em><nobr>21 Nov 2007</nobr></em></td>
   </tr>
 </table>
 </p>
diff --git a/docs/html/sdk/android-1.6.jd b/docs/html/sdk/android-1.6.jd
new file mode 100644
index 000000000000..29dceec58c03
--- /dev/null
+++ b/docs/html/sdk/android-1.6.jd
@@ -0,0 +1,235 @@
+page.title=Android 1.6 Version Notes
+
+@jd:body
+
+<p>
+<em>Date:</em> September 2009<br />
+<em>API Level:</em>&nbsp;<strong>4</strong></p>
+
+
+<p>This document provides version notes for the Android 1.6 system image included in the SDK. </p>
+
+<ul>
+<li><a href="#overview">Overview</a>
+<li><a href="#features">New Features</a>
+<li><a href="#apps">Built-in Applications</a>
+<li><a href="#locs">Locales</a>
+<li><a href="#api-changes">API Changes</a>
+</ul>
+
+<h2 id="overview">Overview</h2>
+
+<p>The Android 1.6 system delivered in the SDK (as library and system image) is
+the development counterpart to the Android 1.6 production system image,
+deployable to Android-powered handsets starting September 2009. The system is fully
+compliant and includes no external libraries.</p>
+
+<p>The Android 1.6 system delivers an updated version of the framework
+API. As with previous versions, the Android 1.6 API 
+is assigned an integer identifier &mdash; <strong>4</strong> &mdash; that is
+stored in the system itself. This identifier, called the "API Level", allows the
+system to correctly determine whether an application is compatible with
+the system, prior to installing the application. </p>
+
+<p>For more information about how to use API Level, see the <a
+href="{@docRoot}guide/developing/">API Levels</a> document. </p>
+
+<h2 id="features">New Features</h2>
+
+<p>For a list of new system features, see the <a
+href="http://developer.android.com/sdk/android-1.6-highlights.html">Android 1.6 Platform
+Highlights</a> document.</p>
+
+<h2 id="apps">Built-in Applications</h2>
+
+<p>The system image includes these built-in applications:</p>
+	<ul>
+	<li>Alarm Clock</li>
+	<li>Browser</li>
+	<li>Calculator</li>
+	<li>Camcorder</li>
+	<li>Camera</li>
+	<li>Contacts</li>
+	<li>Custom Locale (developer app)</li>
+	<li>Dev Tools (developer app)</li>
+	<li>Dialer</li>
+	<li>Email</li>
+	<li>Gallery</li>
+	<li>Gestures Builder</li>
+	<li>IME for Japanese text input</li>
+	<li>Messaging</li>
+	<li>Music</li>
+	<li>Settings</li>
+	<li>Spare Parts (developer app)</li>
+	</ul>
+
+<h2 id="locs">Locales</h2>
+
+<p>The system image provides a variety of built-in locales. In some cases, 
+region-specific strings are available for the locales. In other cases, 
+a default version of the language is used. The languages that will be 
+available in the Android 1.6 system image are listed below (with 
+<em>language</em>_<em>country/region</em> locale descriptor).</p>
+
+<table style="border:0;">
+<tr>
+<td style="border:0">
+<ul style="margin-bottom:0;">
+<li>Arabic, Egypt (ar_EG)</li>
+<li>Arabic, Israel (ar_IL)</li>
+<li>Bulgarian, Bulgaria (bg_BG)</li>
+<li>Chinese, PRC (zh_CN)</li>
+<li>Chinese, Taiwan (zh_TW)</li>
+<li>Croatian, Croatia (hr_HR)</li>
+<li>Czech, Czech Republic (cs_CZ)</li>
+<li>Danish, Denmark (da_DK)</li>
+<li>Dutch, Netherlands (nl_NL)</li>
+<li>Dutch, Belgium (nl_BE)</li>
+<li>English, US (en_US)</li>
+<li>English, Britain (en_GB)</li>
+<li>English, Canada (en_CA)</li>
+<li>English, Australia (en_AU)</li>
+<li>English, India (en_IN)</li>
+<li>English, Ireland (en_IE)</li>
+<li>English, New Zealand (en_NZ)</li>
+<li>English, Singapore (en_SG)</li>
+<li>English, South Africa (en_ZA)</li>
+<li>Finnish, Finland (fi_FI)</li>
+<li>French, France (fr_FR)</li>
+<li>French, Belgium (fr_BE)</li>
+<li>French, Canada (fr_CA)</li>
+<li>French, Switzerland (fr_CH)</li>
+<li>German, Germany (de_DE)</li>
+<li>German, Austria (de_AT)</li>
+<li>German, Switzerland (de_CH)</li>
+<li>German, Liechtenstein (de_LI)</li>
+</ul>
+</td>
+<td style="border:0;padding-left:5em;">
+<ul style="margin-bottom:0;">
+<li>Greek, Greece (el_GR)</li>
+<li>Hindi, India (hi_IN)</li>
+<li>Hungarian, Hungary (hu_HU)</li>
+<li>Indonesian, Indonesia (id_ID)</li>
+<li>Italian, Italy (it_IT)</li>
+<li>Italian, Switzerland (it_CH)</li>
+<li>Japanese, Japan (ja_JP)</li>
+<li>Korean, Korea (ko_KR)</li>
+<li>Latvian, Latvia (lv_LV)</li>
+<li>Lithuanian, Lithuania (lt_LT)</li>
+<li>Norwegian Bokmål, Norway (nb_NO)</li>
+<li>Polish, Poland (pl_PL)</li>
+<li>Portuguese, Brazil (pt_BR)</li>
+<li>Portuguese, Portugal (pt_PT)</li>
+<li>Romanian, Romania (ro_RO)</li>
+<li>Russian, Russia (ru_RU)</li>
+<li>Serbian, Serbia (sr_RS)</li>
+<li>Slovak, Slovakia (sk_SK)</li>
+<li>Slovenian, Slovenia (sl_SI)</li>
+<li>Spanish, Spain (es_ES)</li>
+<li>Spanish, US (es_US)</li>
+<li>Swedish, Sweden (sv_SE)</li>
+<li>Thai, Thailand (th_TH)</li>
+<li>Tagalog, Philippines (tl_PH)</li>
+<li>Turkish, Turkey (tr_TR)</li>
+<li>Ukranian, Ukrania (uk_UA)</li>
+<li>Vietnamese, Vietnam (vi_VN)</li>
+</ul>
+</td>
+</tr>
+</table>
+
+<p>Localized UI strings match the locales that are displayable in 
+the emulator, accessible through the device Settings application.</p>
+
+<h2 id="api-changes">API Changes</h2>
+
+<h3 style="padding-top:0">Overview</h3>
+
+<ul>
+
+<li>Search framework</li>
+  <ul>
+    <li>Applications can now expose relevant content to users as search suggestions in the Quick Search Box, a new device-wide search capability that is accessible from the home screen. To support this, the search framework adds new attributes to the searchable metadata file. For complete information, see the {@link android.app.SearchManager SearchManager} documentation.</li>
+  </ul>
+</li>
+
+<li>Accessibility framework</li>
+  <ul>
+    <li>New {@link android.view.accessibility android.accessibility} package
+that includes classes for capturing accessibility events and forwarding them to
+an {@link android.accessibilityservice AccessibilityService} handler. </li>
+    <li>New {@link android.accessibilityservice AccessibilityService} package
+that lets your application track user events and provide visual, audible, or
+haptic feedback to the user. </li>
+  </ul>
+</li>
+
+<li>Gestures</li>
+  <ul>
+    <li>New {@link android.gesture gesture} API for creating, recognizing,
+loading, and saving gestures.</li>
+  </ul>
+</li>
+
+<li>Text-to-speech</li>
+  <ul>
+    <li>New package {@link android.speech.tts android.speech.tts} provides
+classes for synthesizing speech from text, for immediate playback or to create a
+sound file.</li>
+  </ul>
+</li>
+
+<li>Permissions</li>
+  <ul>
+
+    <li>New permissions for 
+{@link android.Manifest.permission#CHANGE_WIFI_MULTICAST_STATE CHANGE_WIFI_MULTICAST_STATE}, 
+{@link android.Manifest.permission#INSTALL_LOCATION_PROVIDER INSTALL_LOCATION_PROVIDER}, 
+{@link android.Manifest.permission#READ_HISTORY_BOOKMARKS READ_HISTORY_BOOKMARKS},
+{@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE WRITE_EXTERNAL_STORAGE}, and  
+{@link android.Manifest.permission#WRITE_HISTORY_BOOKMARKS WRITE_HISTORY_BOOKMARKS}.</li>
+  </ul>
+</li>
+
+<li>Graphics</li>
+  <ul>
+    <li>Classes in {@link android.graphics android.graphics} now support scaling
+for different screen densities.</li>
+  </ul>
+</li>
+
+<li>Telephony</li>
+  <ul>
+    <li>New {@link android.telephony.SmsManager SmsManager} and other classes
+for sending and receiving SMS messages.</li>
+  </ul>
+</li>
+
+<li>Utilities</li>
+  <ul>
+    <li>New {@link android.util.DisplayMetrics DisplayMetrics} fields for
+determining the density of the current device screen.</li>
+  </ul>
+</li>
+
+<li>Application-defined support for various screen densities</li>
+   <p>Applications can now use a new element in their manifest files, <a
+href="{@docRoot}guide/topics/manifest/supports-screen-element.html">&lt;supports-
+screen&gt;</a> to indicate to the specific screen resolutions/densities that
+they are designed to support. When the application is installed on a device
+whose screen is not explicitly supported by the application, the system
+runs the application in Compatibility Mode, where possible. </p>
+</li>
+</ul>
+
+<h3 id="api-diff">API Change Details</h3>
+
+<p>For a detailed view of API changes in this platform (API Level 4), see the <a
+href="{@docRoot}sdk/api_diff/4/changes.html">API Differences Report</a>.</p>
+
+
+
+
+
+
diff --git a/docs/html/sdk/api_diff/4/changes.html b/docs/html/sdk/api_diff/4/changes.html
index da18ae66cfe8..c1b66a1ef24f 100644
--- a/docs/html/sdk/api_diff/4/changes.html
+++ b/docs/html/sdk/api_diff/4/changes.html
@@ -4,11 +4,11 @@
 <meta name="generator" content="JDiff v1.1.0">
 <!-- Generated by the JDiff Javadoc doclet -->
 <!-- (http://www.jdiff.org) -->
-<!-- on Wed Aug 05 19:20:54 PDT 2009 -->
+<!-- on Wed Sep 02 18:26:54 PDT 2009 -->
 <meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
 <meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
 <TITLE>
-API Differences between 3 and Donut
+API Differences between 3 and 4
 </TITLE>
 <link href="../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
 <link href="stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
diff --git a/docs/html/sdk/api_diff/4/changes/alldiffs_index_additions.html b/docs/html/sdk/api_diff/4/changes/alldiffs_index_additions.html
index 048f928c0c60..cb7b0f9b6907 100644
--- a/docs/html/sdk/api_diff/4/changes/alldiffs_index_additions.html
+++ b/docs/html/sdk/api_diff/4/changes/alldiffs_index_additions.html
@@ -69,6 +69,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.provider.Settings.Secure.html#android.provider.Settings.Secure.ACCESSIBILITY_ENABLED" class="hiddenlink" target="rightframe">ACCESSIBILITY_ENABLED</A>
@@ -157,6 +158,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.backupAgent" class="hiddenlink" target="rightframe">backupAgent</A>
@@ -200,6 +202,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE" class="hiddenlink" target="rightframe">CHANGE_WIFI_MULTICAST_STATE</A>
@@ -262,6 +265,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.graphics.BitmapFactory.html#android.graphics.BitmapFactory.decodeResourceStream_added(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, android.graphics.Rect, android.graphics.BitmapFactory.Options)" class="hiddenlink" target="rightframe"><b>decodeResourceStream</b>
@@ -316,952 +320,6 @@ body{overflow:auto;}
 &nbsp;&nbsp;<nobr><A HREF="android.view.Window.Callback.html#android.view.Window.Callback.dispatchPopulateAccessibilityEvent_added(android.view.accessibility.AccessibilityEvent)" class="hiddenlink" target="rightframe">type&nbsp;<b>
 (<code>AccessibilityEvent</code>)</b>&nbsp;in&nbsp;android.view.Window.Callback
 </A></nobr><br>
-<!-- Field donut_resource_pad1 -->
-<i>donut_resource_pad1</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-<i>donut_resource_pad10</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-<i>donut_resource_pad11</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-<i>donut_resource_pad12</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-<i>donut_resource_pad13</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-<i>donut_resource_pad14</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-<i>donut_resource_pad15</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-<i>donut_resource_pad16</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-<i>donut_resource_pad17</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-<i>donut_resource_pad18</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-<i>donut_resource_pad19</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-<i>donut_resource_pad2</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-<i>donut_resource_pad20</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-<i>donut_resource_pad21</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-<i>donut_resource_pad22</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad23 -->
-<i>donut_resource_pad23</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad23 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad23 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad24 -->
-<i>donut_resource_pad24</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad24 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad24 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad25 -->
-<i>donut_resource_pad25</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad25 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad25 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad26 -->
-<i>donut_resource_pad26</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad26 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad26 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad27 -->
-<i>donut_resource_pad27</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad27 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad27 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad28 -->
-<i>donut_resource_pad28</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad28 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad29 -->
-<i>donut_resource_pad29</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad29 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-<i>donut_resource_pad3</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad30 -->
-<i>donut_resource_pad30</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad30 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad31 -->
-<i>donut_resource_pad31</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad31 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad32 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad32" class="hiddenlink" target="rightframe">donut_resource_pad32</A>
-</nobr><br>
-<!-- Field donut_resource_pad33 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad33" class="hiddenlink" target="rightframe">donut_resource_pad33</A>
-</nobr><br>
-<!-- Field donut_resource_pad34 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad34" class="hiddenlink" target="rightframe">donut_resource_pad34</A>
-</nobr><br>
-<!-- Field donut_resource_pad35 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad35" class="hiddenlink" target="rightframe">donut_resource_pad35</A>
-</nobr><br>
-<!-- Field donut_resource_pad36 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad36" class="hiddenlink" target="rightframe">donut_resource_pad36</A>
-</nobr><br>
-<!-- Field donut_resource_pad37 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad37" class="hiddenlink" target="rightframe">donut_resource_pad37</A>
-</nobr><br>
-<!-- Field donut_resource_pad38 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad38" class="hiddenlink" target="rightframe">donut_resource_pad38</A>
-</nobr><br>
-<!-- Field donut_resource_pad39 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad39" class="hiddenlink" target="rightframe">donut_resource_pad39</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-<i>donut_resource_pad4</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad40 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad40" class="hiddenlink" target="rightframe">donut_resource_pad40</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-<i>donut_resource_pad5</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-<i>donut_resource_pad6</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-<i>donut_resource_pad7</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-<i>donut_resource_pad8</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-<i>donut_resource_pad9</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
 <!-- Field dropDownHeight -->
 <nobr><A HREF="android.R.attr.html#android.R.attr.dropDownHeight" class="hiddenlink" target="rightframe">dropDownHeight</A>
 </nobr><br>
@@ -1287,6 +345,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.provider.Settings.Secure.html#android.provider.Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES" class="hiddenlink" target="rightframe">ENABLED_ACCESSIBILITY_SERVICES</A>
@@ -1322,6 +381,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.fadeDuration" class="hiddenlink" target="rightframe">fadeDuration</A>
@@ -1384,6 +444,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.gestureColor" class="hiddenlink" target="rightframe">gestureColor</A>
@@ -1557,6 +618,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <i>ImageSpan</i><br>
@@ -1638,6 +700,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.largeScreens" class="hiddenlink" target="rightframe">largeScreens</A>
@@ -1667,6 +730,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.os.Build.html#android.os.Build.MANUFACTURER" class="hiddenlink" target="rightframe">MANUFACTURER</A>
@@ -1696,6 +760,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <i>NinePatchDrawable</i><br>
@@ -1729,6 +794,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.os.RemoteCallbackList.html#android.os.RemoteCallbackList.onCallbackDied_added(E, java.lang.Object)" class="hiddenlink" target="rightframe"><b>onCallbackDied</b>
@@ -1763,6 +829,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.content.Intent.html#android.content.Intent.parseUri_added(java.lang.String, int)" class="hiddenlink" target="rightframe"><b>parseUri</b>
@@ -1806,6 +873,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.queryAfterZeroResults" class="hiddenlink" target="rightframe">queryAfterZeroResults</A>
@@ -1832,6 +900,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.READ_HISTORY_BOOKMARKS" class="hiddenlink" target="rightframe">READ_HISTORY_BOOKMARKS</A>
@@ -1870,6 +939,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.screenLayout" class="hiddenlink" target="rightframe">screenLayout</A>
@@ -2055,6 +1125,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <i>targetSdkVersion</i><br>
@@ -2330,6 +1401,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.uncertainGestureColor" class="hiddenlink" target="rightframe">uncertainGestureColor</A>
@@ -2365,6 +1437,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.view.html#ViewDebug.FlagToString" class="hiddenlink" target="rightframe"><b>ViewDebug.FlagToString</b></A><br>
@@ -2399,6 +1472,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.style.html#android.R.style.Widget_ProgressBar_Inverse" class="hiddenlink" target="rightframe">Widget_ProgressBar_Inverse</A>
@@ -2417,6 +1491,34 @@ body{overflow:auto;}
 <!-- Field WRITE_HISTORY_BOOKMARKS -->
 <nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.WRITE_HISTORY_BOOKMARKS" class="hiddenlink" target="rightframe">WRITE_HISTORY_BOOKMARKS</A>
 </nobr><br>
+<!-- Class ZoomButtonsController -->
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#ZoomButtonsController" class="hiddenlink" target="rightframe"><b>ZoomButtonsController</b></A><br>
+<!-- Class ZoomButtonsController.OnZoomListener -->
+<A HREF="pkg_android.widget.html#ZoomButtonsController.OnZoomListener" class="hiddenlink" target="rightframe"><b><i>ZoomButtonsController.OnZoomListener</i></b></A><br>
 <script src="http://www.google-analytics.com/ga.js" type="text/javascript">
 </script>
 <script type="text/javascript">
diff --git a/docs/html/sdk/api_diff/4/changes/alldiffs_index_all.html b/docs/html/sdk/api_diff/4/changes/alldiffs_index_all.html
index d20054b73053..4c52602cfe82 100644
--- a/docs/html/sdk/api_diff/4/changes/alldiffs_index_all.html
+++ b/docs/html/sdk/api_diff/4/changes/alldiffs_index_all.html
@@ -71,6 +71,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.provider.Settings.Secure.html#android.provider.Settings.Secure.ACCESSIBILITY_ENABLED" class="hiddenlink" target="rightframe">ACCESSIBILITY_ENABLED</A>
@@ -228,6 +229,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.backupAgent" class="hiddenlink" target="rightframe">backupAgent</A>
@@ -291,6 +293,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <i>calculateLength</i><br>
@@ -385,6 +388,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <i>Date</i><br>
@@ -464,952 +468,6 @@ body{overflow:auto;}
 <!-- Method divideMessage -->
 <nobr><A HREF="android.telephony.gsm.SmsManager.html#android.telephony.gsm.SmsManager.divideMessage_changed(java.lang.String)" class="hiddenlink" target="rightframe">divideMessage
 (<code>String</code>)</A></nobr><br>
-<!-- Field donut_resource_pad1 -->
-<i>donut_resource_pad1</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad1 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-<i>donut_resource_pad10</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad10 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-<i>donut_resource_pad11</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad11 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-<i>donut_resource_pad12</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad12 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-<i>donut_resource_pad13</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad13 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-<i>donut_resource_pad14</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad14 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-<i>donut_resource_pad15</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad15 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-<i>donut_resource_pad16</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad16 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-<i>donut_resource_pad17</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad17 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-<i>donut_resource_pad18</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad18 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-<i>donut_resource_pad19</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad19 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-<i>donut_resource_pad2</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad2 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-<i>donut_resource_pad20</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad20 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-<i>donut_resource_pad21</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad21 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-<i>donut_resource_pad22</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad22 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad23 -->
-<i>donut_resource_pad23</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad23 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad23 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad24 -->
-<i>donut_resource_pad24</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad24 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad24 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad25 -->
-<i>donut_resource_pad25</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad25 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad25 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad26 -->
-<i>donut_resource_pad26</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad26 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad26 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad27 -->
-<i>donut_resource_pad27</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad27 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad27 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad28 -->
-<i>donut_resource_pad28</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad28 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad29 -->
-<i>donut_resource_pad29</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad29 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-<i>donut_resource_pad3</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad3 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad30 -->
-<i>donut_resource_pad30</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad30 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad31 -->
-<i>donut_resource_pad31</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad31 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad32 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad32" class="hiddenlink" target="rightframe">donut_resource_pad32</A>
-</nobr><br>
-<!-- Field donut_resource_pad33 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad33" class="hiddenlink" target="rightframe">donut_resource_pad33</A>
-</nobr><br>
-<!-- Field donut_resource_pad34 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad34" class="hiddenlink" target="rightframe">donut_resource_pad34</A>
-</nobr><br>
-<!-- Field donut_resource_pad35 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad35" class="hiddenlink" target="rightframe">donut_resource_pad35</A>
-</nobr><br>
-<!-- Field donut_resource_pad36 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad36" class="hiddenlink" target="rightframe">donut_resource_pad36</A>
-</nobr><br>
-<!-- Field donut_resource_pad37 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad37" class="hiddenlink" target="rightframe">donut_resource_pad37</A>
-</nobr><br>
-<!-- Field donut_resource_pad38 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad38" class="hiddenlink" target="rightframe">donut_resource_pad38</A>
-</nobr><br>
-<!-- Field donut_resource_pad39 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad39" class="hiddenlink" target="rightframe">donut_resource_pad39</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-<i>donut_resource_pad4</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad4 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad40 -->
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad40" class="hiddenlink" target="rightframe">donut_resource_pad40</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-<i>donut_resource_pad5</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad5 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-<i>donut_resource_pad6</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad6 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-<i>donut_resource_pad7</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad7 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-<i>donut_resource_pad8</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad8 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-<i>donut_resource_pad9</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<!-- Field donut_resource_pad9 -->
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
 <!-- Class Drawable -->
 <A HREF="android.graphics.drawable.Drawable.html" class="hiddenlink" target="rightframe">Drawable</A><br>
 <!-- Field dropDownHeight -->
@@ -1439,6 +497,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.provider.Settings.Secure.html#android.provider.Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES" class="hiddenlink" target="rightframe">ENABLED_ACCESSIBILITY_SERVICES</A>
@@ -1494,6 +553,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.fadeDuration" class="hiddenlink" target="rightframe">fadeDuration</A>
@@ -1564,6 +624,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.gestureColor" class="hiddenlink" target="rightframe">gestureColor</A>
@@ -1817,6 +878,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <i>ImageSpan</i><br>
@@ -2030,6 +1092,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.inputmethodservice.KeyboardView.html" class="hiddenlink" target="rightframe">KeyboardView</A><br>
@@ -2057,6 +1120,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.largeScreens" class="hiddenlink" target="rightframe">largeScreens</A>
@@ -2103,6 +1167,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.Manifest.permission.html" class="hiddenlink" target="rightframe">Manifest.permission</A><br>
@@ -2159,6 +1224,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.graphics.NinePatch.html" class="hiddenlink" target="rightframe">NinePatch</A><br>
@@ -2204,6 +1270,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.os.RemoteCallbackList.html#android.os.RemoteCallbackList.onCallbackDied_added(E, java.lang.Object)" class="hiddenlink" target="rightframe"><b>onCallbackDied</b>
@@ -2246,6 +1313,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.content.pm.PackageManager.html" class="hiddenlink" target="rightframe">PackageManager</A><br>
@@ -2302,6 +1370,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.queryAfterZeroResults" class="hiddenlink" target="rightframe">queryAfterZeroResults</A>
@@ -2330,27 +1399,14 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.R.anim.html" class="hiddenlink" target="rightframe">R.anim</A><br>
-<!-- Class R.array -->
-<A HREF="android.R.array.html" class="hiddenlink" target="rightframe">R.array</A><br>
 <!-- Class R.attr -->
 <A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
-<!-- Class R.color -->
-<A HREF="android.R.color.html" class="hiddenlink" target="rightframe">R.color</A><br>
-<!-- Class R.dimen -->
-<A HREF="android.R.dimen.html" class="hiddenlink" target="rightframe">R.dimen</A><br>
 <!-- Class R.drawable -->
 <A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
-<!-- Class R.id -->
-<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
-<!-- Class R.integer -->
-<A HREF="android.R.integer.html" class="hiddenlink" target="rightframe">R.integer</A><br>
-<!-- Class R.layout -->
-<A HREF="android.R.layout.html" class="hiddenlink" target="rightframe">R.layout</A><br>
-<!-- Class R.string -->
-<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
 <!-- Class R.style -->
 <A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
 <!-- Field READ_HISTORY_BOOKMARKS -->
@@ -2412,6 +1468,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.content.res.Configuration.html#android.content.res.Configuration.screenLayout" class="hiddenlink" target="rightframe">screenLayout</A>
@@ -2699,6 +1756,7 @@ body{overflow:auto;}
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.widget.TabHost.TabSpec.html" class="hiddenlink" target="rightframe">TabHost.TabSpec</A><br>
@@ -2989,6 +2047,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.attr.html#android.R.attr.uncertainGestureColor" class="hiddenlink" target="rightframe">uncertainGestureColor</A>
@@ -3026,6 +2085,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.view.VelocityTracker.html" class="hiddenlink" target="rightframe">VelocityTracker</A><br>
@@ -3068,6 +2128,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#U"><font size="-2">U</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <nobr><A HREF="android.R.style.html#android.R.style.Widget_ProgressBar_Inverse" class="hiddenlink" target="rightframe">Widget_ProgressBar_Inverse</A>
@@ -3090,6 +2151,36 @@ body{overflow:auto;}
 <!-- Field WRITE_HISTORY_BOOKMARKS -->
 <nobr><A HREF="android.Manifest.permission.html#android.Manifest.permission.WRITE_HISTORY_BOOKMARKS" class="hiddenlink" target="rightframe">WRITE_HISTORY_BOOKMARKS</A>
 </nobr><br>
+<!-- Class ZoomButtonsController -->
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#E"><font size="-2">E</font></a> 
+<a href="#F"><font size="-2">F</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#J"><font size="-2">J</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#Q"><font size="-2">Q</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#U"><font size="-2">U</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#ZoomButtonsController" class="hiddenlink" target="rightframe"><b>ZoomButtonsController</b></A><br>
+<!-- Class ZoomButtonsController.OnZoomListener -->
+<A HREF="pkg_android.widget.html#ZoomButtonsController.OnZoomListener" class="hiddenlink" target="rightframe"><b><i>ZoomButtonsController.OnZoomListener</i></b></A><br>
 <script src="http://www.google-analytics.com/ga.js" type="text/javascript">
 </script>
 <script type="text/javascript">
diff --git a/docs/html/sdk/api_diff/4/changes/alldiffs_index_changes.html b/docs/html/sdk/api_diff/4/changes/alldiffs_index_changes.html
index 8195523e9523..8b9e6972d5bb 100644
--- a/docs/html/sdk/api_diff/4/changes/alldiffs_index_changes.html
+++ b/docs/html/sdk/api_diff/4/changes/alldiffs_index_changes.html
@@ -705,24 +705,10 @@ body{overflow:auto;}
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.R.anim.html" class="hiddenlink" target="rightframe">R.anim</A><br>
-<!-- Class R.array -->
-<A HREF="android.R.array.html" class="hiddenlink" target="rightframe">R.array</A><br>
 <!-- Class R.attr -->
 <A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
-<!-- Class R.color -->
-<A HREF="android.R.color.html" class="hiddenlink" target="rightframe">R.color</A><br>
-<!-- Class R.dimen -->
-<A HREF="android.R.dimen.html" class="hiddenlink" target="rightframe">R.dimen</A><br>
 <!-- Class R.drawable -->
 <A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
-<!-- Class R.id -->
-<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
-<!-- Class R.integer -->
-<A HREF="android.R.integer.html" class="hiddenlink" target="rightframe">R.integer</A><br>
-<!-- Class R.layout -->
-<A HREF="android.R.layout.html" class="hiddenlink" target="rightframe">R.layout</A><br>
-<!-- Class R.string -->
-<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
 <!-- Class R.style -->
 <A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
 <!-- Field RELEASE -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.Manifest.permission.html b/docs/html/sdk/api_diff/4/changes/android.Manifest.permission.html
index b0389a165745..76a009536961 100644
--- a/docs/html/sdk/api_diff/4/changes/android.Manifest.permission.html
+++ b/docs/html/sdk/api_diff/4/changes/android.Manifest.permission.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.Manifest.permission_group.html b/docs/html/sdk/api_diff/4/changes/android.Manifest.permission_group.html
index 628ef0709619..10347eb22770 100644
--- a/docs/html/sdk/api_diff/4/changes/android.Manifest.permission_group.html
+++ b/docs/html/sdk/api_diff/4/changes/android.Manifest.permission_group.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.anim.html b/docs/html/sdk/api_diff/4/changes/android.R.anim.html
index cce8c29daf90..93459a581734 100644
--- a/docs/html/sdk/api_diff/4/changes/android.R.anim.html
+++ b/docs/html/sdk/api_diff/4/changes/android.R.anim.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -105,153 +105,6 @@ Class android.<A HREF="../../../../reference/android/R.anim.html" target="_top">
 </TR>
 <TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
   <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad19"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad19" target="_top"><code>donut_resource_pad19</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad20"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad20" target="_top"><code>donut_resource_pad20</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad21"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad21" target="_top"><code>donut_resource_pad21</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.anim.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
   <A NAME="android.R.anim.linear_interpolator"></A>
   <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.anim.html#linear_interpolator" target="_top"><code>linear_interpolator</code></A></nobr>
   </TD>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.array.html b/docs/html/sdk/api_diff/4/changes/android.R.array.html
deleted file mode 100644
index 43bd0b1cfd73..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.array.html
+++ /dev/null
@@ -1,199 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.array
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.array.html" target="_top"><font size="+2"><code>R.array</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.array.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.array.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.attr.html b/docs/html/sdk/api_diff/4/changes/android.R.attr.html
index a4b9adb84866..a1923f63b820 100644
--- a/docs/html/sdk/api_diff/4/changes/android.R.attr.html
+++ b/docs/html/sdk/api_diff/4/changes/android.R.attr.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -119,132 +119,6 @@ Class android.<A HREF="../../../../reference/android/R.attr.html" target="_top">
 </TR>
 <TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
   <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.attr.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
   <A NAME="android.R.attr.dropDownHeight"></A>
   <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.attr.html#dropDownHeight" target="_top"><code>dropDownHeight</code></A></nobr>
   </TD>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.color.html b/docs/html/sdk/api_diff/4/changes/android.R.color.html
deleted file mode 100644
index 20ce475d4c4b..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.color.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.color
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.color.html" target="_top"><font size="+2"><code>R.color</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad19"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad19" target="_top"><code>donut_resource_pad19</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad20"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad20" target="_top"><code>donut_resource_pad20</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad21"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad21" target="_top"><code>donut_resource_pad21</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad22"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad22" target="_top"><code>donut_resource_pad22</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad23"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad23" target="_top"><code>donut_resource_pad23</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad24"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad24" target="_top"><code>donut_resource_pad24</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad25"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad25" target="_top"><code>donut_resource_pad25</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad26"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad26" target="_top"><code>donut_resource_pad26</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad27"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad27" target="_top"><code>donut_resource_pad27</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad28"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad28" target="_top"><code>donut_resource_pad28</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad29"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad29" target="_top"><code>donut_resource_pad29</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad30"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad30" target="_top"><code>donut_resource_pad30</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad31"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad31" target="_top"><code>donut_resource_pad31</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.color.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.color.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.dimen.html b/docs/html/sdk/api_diff/4/changes/android.R.dimen.html
deleted file mode 100644
index d6736d741e42..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.dimen.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.dimen
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.dimen.html" target="_top"><font size="+2"><code>R.dimen</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.dimen.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.dimen.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.drawable.html b/docs/html/sdk/api_diff/4/changes/android.R.drawable.html
index 25776a9d66d7..9ecf62872ba5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.R.drawable.html
+++ b/docs/html/sdk/api_diff/4/changes/android.R.drawable.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -84,286 +84,6 @@ Class android.<A HREF="../../../../reference/android/R.drawable.html" target="_t
 </TH>
 <TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
   <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad19"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad19" target="_top"><code>donut_resource_pad19</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad20"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad20" target="_top"><code>donut_resource_pad20</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad21"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad21" target="_top"><code>donut_resource_pad21</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad22"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad22" target="_top"><code>donut_resource_pad22</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad23"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad23" target="_top"><code>donut_resource_pad23</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad24"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad24" target="_top"><code>donut_resource_pad24</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad25"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad25" target="_top"><code>donut_resource_pad25</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad26"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad26" target="_top"><code>donut_resource_pad26</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad27"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad27" target="_top"><code>donut_resource_pad27</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad28"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad28" target="_top"><code>donut_resource_pad28</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad29"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad29" target="_top"><code>donut_resource_pad29</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad30"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad30" target="_top"><code>donut_resource_pad30</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad31"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad31" target="_top"><code>donut_resource_pad31</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad32"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad32" target="_top"><code>donut_resource_pad32</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad33"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad33" target="_top"><code>donut_resource_pad33</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad34"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad34" target="_top"><code>donut_resource_pad34</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad35"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad35" target="_top"><code>donut_resource_pad35</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad36"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad36" target="_top"><code>donut_resource_pad36</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad37"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad37" target="_top"><code>donut_resource_pad37</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad38"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad38" target="_top"><code>donut_resource_pad38</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad39"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad39" target="_top"><code>donut_resource_pad39</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad40"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad40" target="_top"><code>donut_resource_pad40</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.drawable.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
   <A NAME="android.R.drawable.stat_sys_vp_phone_call"></A>
   <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.drawable.html#stat_sys_vp_phone_call" target="_top"><code>stat_sys_vp_phone_call</code></A></nobr>
   </TD>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.id.html b/docs/html/sdk/api_diff/4/changes/android.R.id.html
deleted file mode 100644
index 4fb48947496b..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.id.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.id
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.id.html" target="_top"><font size="+2"><code>R.id</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad19"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad19" target="_top"><code>donut_resource_pad19</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad20"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad20" target="_top"><code>donut_resource_pad20</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad21"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad21" target="_top"><code>donut_resource_pad21</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad22"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad22" target="_top"><code>donut_resource_pad22</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.id.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.id.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.integer.html b/docs/html/sdk/api_diff/4/changes/android.R.integer.html
deleted file mode 100644
index 6b9e2c014009..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.integer.html
+++ /dev/null
@@ -1,213 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.integer
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.integer.html" target="_top"><font size="+2"><code>R.integer</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.integer.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.integer.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.layout.html b/docs/html/sdk/api_diff/4/changes/android.R.layout.html
deleted file mode 100644
index b8aeabd2b369..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.layout.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.layout
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.layout.html" target="_top"><font size="+2"><code>R.layout</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.layout.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.layout.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.string.html b/docs/html/sdk/api_diff/4/changes/android.R.string.html
deleted file mode 100644
index 770be4ed77c9..000000000000
--- a/docs/html/sdk/api_diff/4/changes/android.R.string.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML style="overflow:auto;">
-<HEAD>
-<meta name="generator" content="JDiff v1.1.0">
-<!-- Generated by the JDiff Javadoc doclet -->
-<!-- (http://www.jdiff.org) -->
-<meta name="description" content="JDiff is a Javadoc doclet which generates an HTML report of all the packages, classes, constructors, methods, and fields which have been removed, added or changed in any way, including their documentation, when two APIs are compared.">
-<meta name="keywords" content="diff, jdiff, javadiff, java diff, java difference, API difference, difference between two APIs, API diff, Javadoc, doclet">
-<TITLE>
-android.R.string
-</TITLE>
-<link href="../../../../assets/android-developer-docs.css" rel="stylesheet" type="text/css" />
-<link href="../stylesheet-jdiff.css" rel="stylesheet" type="text/css" />
-<noscript>
-<style type="text/css">
-body{overflow:auto;}
-#body-content{position:relative; top:0;}
-#doc-content{overflow:visible;border-left:3px solid #666;}
-#side-nav{padding:0;}
-#side-nav .toggle-list ul {display:block;}
-#resize-packages-nav{border-bottom:3px solid #666;}
-</style>
-</noscript>
-<style type="text/css">
-</style>
-</HEAD>
-<BODY>
-<!-- Start of nav bar -->
-<a name="top"></a>
-<div id="header" style="margin-bottom:0;padding-bottom:0;">
-<div id="headerLeft">
-<a href="../../../../index.html" tabindex="-1" target="_top"><img src="../../../../assets/images/bg_logo.png" alt="Android Developers" /></a>
-</div>
-  <div id="headerRight">
-  <div id="headerLinks">
-<!-- <img src="/assets/images/icon_world.jpg" alt="" /> -->
-<span class="text">
-<!-- &nbsp;<a href="#">English</a> | -->
-<nobr><a href="http://developer.android.com" target="_top">Android Developers</a> | <a href="http://www.android.com" target="_top">Android.com</a></nobr>
-</span>
-</div>
-  <div class="and-diff-id" style="margin-top:6px;margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td colspan="2" class="diffspechead">API Diff Specification</td>
-      </tr>
-      <tr>
-        <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
-      </tr>
-      <tr>
-        <td class="diffspec">From Level:</td>
-        <td class="diffvalueold">3</td>
-      </tr>
-      <tr>
-        <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
-      </tr>
-    </table>
-    </div><!-- End and-diff-id -->
-  <div class="and-diff-id" style="margin-right:8px;">
-    <table class="diffspectable">
-      <tr>
-        <td class="diffspec" colspan="2"><a href="jdiff_statistics.html">Statistics</a>
-      </tr>
-    </table>
-  </div> <!-- End and-diff-id -->
-  </div> <!-- End headerRight -->
-  </div> <!-- End header -->
-<div id="body-content" xstyle="padding:12px;padding-right:18px;">
-<div id="doc-content" style="position:relative;">
-<div id="mainBodyFluid">
-<H2>
-Class android.<A HREF="../../../../reference/android/R.string.html" target="_top"><font size="+2"><code>R.string</code></font></A>
-</H2>
-<a NAME="constructors"></a>
-<a NAME="methods"></a>
-<a NAME="fields"></a>
-<p>
-<a NAME="Added"></a>
-<TABLE summary="Added Fields" WIDTH="100%">
-<TR>
-  <TH VALIGN="TOP" COLSPAN=2>Added Fields</FONT></TD>
-</TH>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad19"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad19" target="_top"><code>donut_resource_pad19</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad20"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad20" target="_top"><code>donut_resource_pad20</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad21"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad21" target="_top"><code>donut_resource_pad21</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad22"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad22" target="_top"><code>donut_resource_pad22</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad23"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad23" target="_top"><code>donut_resource_pad23</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad24"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad24" target="_top"><code>donut_resource_pad24</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad25"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad25" target="_top"><code>donut_resource_pad25</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad26"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad26" target="_top"><code>donut_resource_pad26</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad27"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad27" target="_top"><code>donut_resource_pad27</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.string.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.string.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-      </div>	
-      <div id="footer">
-        <div id="copyright">
-        Except as noted, this content is licensed under 
-        <a href="http://creativecommons.org/licenses/by/2.5/"> Creative Commons Attribution 2.5</a>.
-        For details and restrictions, see the <a href="/license.html">Content License</a>.
-        </div>
-      <div id="footerlinks">
-      <p>
-        <a href="http://www.android.com/terms.html">Site Terms of Service</a> -
-        <a href="http://www.android.com/privacy.html">Privacy Policy</a> -
-        <a href="http://www.android.com/branding.html">Brand Guidelines</a>
-      </p>
-    </div>
-    </div> <!-- end footer -->
-    </div><!-- end doc-content -->
-    </div> <!-- end body-content --> 
-<script src="http://www.google-analytics.com/ga.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-  try {
-    var pageTracker = _gat._getTracker("UA-5831155-1");
-    pageTracker._setAllowAnchor(true);
-    pageTracker._initData();
-    pageTracker._trackPageview();
-  } catch(e) {}
-</script>
-</BODY>
-</HTML>
diff --git a/docs/html/sdk/api_diff/4/changes/android.R.style.html b/docs/html/sdk/api_diff/4/changes/android.R.style.html
index 5dbe9a1938ad..6755e3db4de4 100644
--- a/docs/html/sdk/api_diff/4/changes/android.R.style.html
+++ b/docs/html/sdk/api_diff/4/changes/android.R.style.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -103,139 +103,6 @@ Class android.<A HREF="../../../../reference/android/R.style.html" target="_top"
   </TD>
   <TD>&nbsp;</TD>
 </TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad1"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad1" target="_top"><code>donut_resource_pad1</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad10"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad10" target="_top"><code>donut_resource_pad10</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad11"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad11" target="_top"><code>donut_resource_pad11</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad12"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad12" target="_top"><code>donut_resource_pad12</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad13"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad13" target="_top"><code>donut_resource_pad13</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad14"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad14" target="_top"><code>donut_resource_pad14</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad15"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad15" target="_top"><code>donut_resource_pad15</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad16"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad16" target="_top"><code>donut_resource_pad16</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad17"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad17" target="_top"><code>donut_resource_pad17</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad18"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad18" target="_top"><code>donut_resource_pad18</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad19"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad19" target="_top"><code>donut_resource_pad19</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad2"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad2" target="_top"><code>donut_resource_pad2</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad3"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad3" target="_top"><code>donut_resource_pad3</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad4"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad4" target="_top"><code>donut_resource_pad4</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad5"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad5" target="_top"><code>donut_resource_pad5</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad6"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad6" target="_top"><code>donut_resource_pad6</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad7"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad7" target="_top"><code>donut_resource_pad7</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad8"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad8" target="_top"><code>donut_resource_pad8</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="android.R.style.donut_resource_pad9"></A>
-  <nobr><code>int</code>&nbsp;<A HREF="../../../../reference/android/R.style.html#donut_resource_pad9" target="_top"><code>donut_resource_pad9</code></A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
 </TABLE>
 &nbsp;
       </div>	
diff --git a/docs/html/sdk/api_diff/4/changes/android.app.Activity.html b/docs/html/sdk/api_diff/4/changes/android.app.Activity.html
index 633252d09113..69503554d666 100644
--- a/docs/html/sdk/api_diff/4/changes/android.app.Activity.html
+++ b/docs/html/sdk/api_diff/4/changes/android.app.Activity.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.app.Dialog.html b/docs/html/sdk/api_diff/4/changes/android.app.Dialog.html
index df5a13ccb5f2..a6ec38735caa 100644
--- a/docs/html/sdk/api_diff/4/changes/android.app.Dialog.html
+++ b/docs/html/sdk/api_diff/4/changes/android.app.Dialog.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.ListItem.html b/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.ListItem.html
index f837ae5e7718..83070a19d10a 100644
--- a/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.ListItem.html
+++ b/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.ListItem.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.html b/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.html
index 2a21f3bdae78..ebfd0ae526a5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.html
+++ b/docs/html/sdk/api_diff/4/changes/android.app.LauncherActivity.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.app.PendingIntent.html b/docs/html/sdk/api_diff/4/changes/android.app.PendingIntent.html
index 032671bdd7ed..221ce6409f81 100644
--- a/docs/html/sdk/api_diff/4/changes/android.app.PendingIntent.html
+++ b/docs/html/sdk/api_diff/4/changes/android.app.PendingIntent.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.app.SearchManager.html b/docs/html/sdk/api_diff/4/changes/android.app.SearchManager.html
index 7cde296d34fa..99df03e9efd2 100644
--- a/docs/html/sdk/api_diff/4/changes/android.app.SearchManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.app.SearchManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.ComponentName.html b/docs/html/sdk/api_diff/4/changes/android.content.ComponentName.html
index 09b3892c94cd..6451a5ba2cad 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.ComponentName.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.ComponentName.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.ContentProvider.html b/docs/html/sdk/api_diff/4/changes/android.content.ContentProvider.html
index 387574cf6717..baeb713d8fe8 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.ContentProvider.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.ContentProvider.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.Context.html b/docs/html/sdk/api_diff/4/changes/android.content.Context.html
index 08ad9ad8b4e7..0d9020263b04 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.Context.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.Context.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.ContextWrapper.html b/docs/html/sdk/api_diff/4/changes/android.content.ContextWrapper.html
index 6f67f68ee8d0..b39cd4699c3e 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.ContextWrapper.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.ContextWrapper.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.Intent.html b/docs/html/sdk/api_diff/4/changes/android.content.Intent.html
index 69995d620b1f..7274c556db5b 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.Intent.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.Intent.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.pm.ActivityInfo.html b/docs/html/sdk/api_diff/4/changes/android.content.pm.ActivityInfo.html
index 369dd3fa6198..ffdccb8120f5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.pm.ActivityInfo.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.pm.ActivityInfo.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.pm.ApplicationInfo.html b/docs/html/sdk/api_diff/4/changes/android.content.pm.ApplicationInfo.html
index e218e8f7d1a5..20f9b6b9c571 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.pm.ApplicationInfo.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.pm.ApplicationInfo.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.pm.ConfigurationInfo.html b/docs/html/sdk/api_diff/4/changes/android.content.pm.ConfigurationInfo.html
index b44626b10c17..600a08f41509 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.pm.ConfigurationInfo.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.pm.ConfigurationInfo.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.pm.PackageManager.html b/docs/html/sdk/api_diff/4/changes/android.content.pm.PackageManager.html
index 86676116054c..921ba9f926f5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.pm.PackageManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.pm.PackageManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.pm.ProviderInfo.html b/docs/html/sdk/api_diff/4/changes/android.content.pm.ProviderInfo.html
index 059c7e056ddc..911419bb76d5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.pm.ProviderInfo.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.pm.ProviderInfo.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.content.res.Configuration.html b/docs/html/sdk/api_diff/4/changes/android.content.res.Configuration.html
index 947243f5d610..cc3f9674d938 100644
--- a/docs/html/sdk/api_diff/4/changes/android.content.res.Configuration.html
+++ b/docs/html/sdk/api_diff/4/changes/android.content.res.Configuration.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.Bitmap.html b/docs/html/sdk/api_diff/4/changes/android.graphics.Bitmap.html
index df2e105adccc..6e99e84420d2 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.Bitmap.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.Bitmap.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.Options.html b/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.Options.html
index bc8cc7cc9576..6c812d0cb17b 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.Options.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.Options.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.html b/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.html
index 8549752d2cab..d730e09b0716 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.BitmapFactory.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.Canvas.html b/docs/html/sdk/api_diff/4/changes/android.graphics.Canvas.html
index 49128fae5e53..48ed8b60b3dc 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.Canvas.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.Canvas.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.NinePatch.html b/docs/html/sdk/api_diff/4/changes/android.graphics.NinePatch.html
index 1a3f94a8dfa8..0d78eb071874 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.NinePatch.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.NinePatch.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.Typeface.html b/docs/html/sdk/api_diff/4/changes/android.graphics.Typeface.html
index 6739f0522c0e..e6d27d41931f 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.Typeface.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.Typeface.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.AnimationDrawable.html b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.AnimationDrawable.html
index c5c7670e20a1..d72281a45468 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.AnimationDrawable.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.AnimationDrawable.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.BitmapDrawable.html b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.BitmapDrawable.html
index 8dea6889397b..4971712444bf 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.BitmapDrawable.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.BitmapDrawable.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.Drawable.html b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.Drawable.html
index 7e52fc66a4c6..e1dc283d467f 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.Drawable.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.Drawable.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.NinePatchDrawable.html b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.NinePatchDrawable.html
index 49245f16b4ba..5eafab032810 100644
--- a/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.NinePatchDrawable.html
+++ b/docs/html/sdk/api_diff/4/changes/android.graphics.drawable.NinePatchDrawable.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.hardware.SensorManager.html b/docs/html/sdk/api_diff/4/changes/android.hardware.SensorManager.html
index 55ebacf3fc3f..87b1f347c365 100644
--- a/docs/html/sdk/api_diff/4/changes/android.hardware.SensorManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.hardware.SensorManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.inputmethodservice.KeyboardView.html b/docs/html/sdk/api_diff/4/changes/android.inputmethodservice.KeyboardView.html
index 6e927b802fc2..bec08b0e3ba7 100644
--- a/docs/html/sdk/api_diff/4/changes/android.inputmethodservice.KeyboardView.html
+++ b/docs/html/sdk/api_diff/4/changes/android.inputmethodservice.KeyboardView.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.location.Address.html b/docs/html/sdk/api_diff/4/changes/android.location.Address.html
index b32f4f38ed12..0aeec499973d 100644
--- a/docs/html/sdk/api_diff/4/changes/android.location.Address.html
+++ b/docs/html/sdk/api_diff/4/changes/android.location.Address.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.media.AudioManager.html b/docs/html/sdk/api_diff/4/changes/android.media.AudioManager.html
index 1ac2b9c0fd14..8d1224c5570d 100644
--- a/docs/html/sdk/api_diff/4/changes/android.media.AudioManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.media.AudioManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.AudioSource.html b/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.AudioSource.html
index b371e46a0ae5..9321b597c9b1 100644
--- a/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.AudioSource.html
+++ b/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.AudioSource.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.html b/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.html
index 8f7aa00b089c..c161466c8d50 100644
--- a/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.html
+++ b/docs/html/sdk/api_diff/4/changes/android.media.MediaRecorder.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.media.ToneGenerator.html b/docs/html/sdk/api_diff/4/changes/android.media.ToneGenerator.html
index c1e1bb88360d..a8d55802cb43 100644
--- a/docs/html/sdk/api_diff/4/changes/android.media.ToneGenerator.html
+++ b/docs/html/sdk/api_diff/4/changes/android.media.ToneGenerator.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.net.wifi.WifiManager.html b/docs/html/sdk/api_diff/4/changes/android.net.wifi.WifiManager.html
index f1fcaad1365e..2e4f339b38a8 100644
--- a/docs/html/sdk/api_diff/4/changes/android.net.wifi.WifiManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.net.wifi.WifiManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.os.Build.VERSION.html b/docs/html/sdk/api_diff/4/changes/android.os.Build.VERSION.html
index 941c554045a1..178adbbe0e5f 100644
--- a/docs/html/sdk/api_diff/4/changes/android.os.Build.VERSION.html
+++ b/docs/html/sdk/api_diff/4/changes/android.os.Build.VERSION.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.os.Build.html b/docs/html/sdk/api_diff/4/changes/android.os.Build.html
index 075819af3049..89fcb4890c69 100644
--- a/docs/html/sdk/api_diff/4/changes/android.os.Build.html
+++ b/docs/html/sdk/api_diff/4/changes/android.os.Build.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.os.RemoteCallbackList.html b/docs/html/sdk/api_diff/4/changes/android.os.RemoteCallbackList.html
index de379ea26a5b..19918aa99f78 100644
--- a/docs/html/sdk/api_diff/4/changes/android.os.RemoteCallbackList.html
+++ b/docs/html/sdk/api_diff/4/changes/android.os.RemoteCallbackList.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Genres.Members.html b/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Genres.Members.html
index af0b161a88a1..a5d47d63d82a 100644
--- a/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Genres.Members.html
+++ b/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Genres.Members.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Media.html b/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Media.html
index aa0744212274..ab8f20623bb5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Media.html
+++ b/docs/html/sdk/api_diff/4/changes/android.provider.MediaStore.Audio.Media.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.provider.Settings.Secure.html b/docs/html/sdk/api_diff/4/changes/android.provider.Settings.Secure.html
index be600e491122..f3494888081f 100644
--- a/docs/html/sdk/api_diff/4/changes/android.provider.Settings.Secure.html
+++ b/docs/html/sdk/api_diff/4/changes/android.provider.Settings.Secure.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.provider.Settings.System.html b/docs/html/sdk/api_diff/4/changes/android.provider.Settings.System.html
index d979133fc1c9..47306024e6e1 100644
--- a/docs/html/sdk/api_diff/4/changes/android.provider.Settings.System.html
+++ b/docs/html/sdk/api_diff/4/changes/android.provider.Settings.System.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsManager.html b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsManager.html
index 35d07a4ba90b..555ec8ceb9a5 100644
--- a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.MessageClass.html b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.MessageClass.html
index c84893946798..e60aada70545 100644
--- a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.MessageClass.html
+++ b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.MessageClass.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.SubmitPdu.html b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.SubmitPdu.html
index af3649684904..03d5b6abb348 100644
--- a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.SubmitPdu.html
+++ b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.SubmitPdu.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.html b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.html
index e480955a4e91..e9f749e0134a 100644
--- a/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.html
+++ b/docs/html/sdk/api_diff/4/changes/android.telephony.gsm.SmsMessage.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.test.AndroidTestCase.html b/docs/html/sdk/api_diff/4/changes/android.test.AndroidTestCase.html
index 8e772ab6793d..b816a07acf90 100644
--- a/docs/html/sdk/api_diff/4/changes/android.test.AndroidTestCase.html
+++ b/docs/html/sdk/api_diff/4/changes/android.test.AndroidTestCase.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.test.mock.MockContext.html b/docs/html/sdk/api_diff/4/changes/android.test.mock.MockContext.html
index 317556adc202..fdc83cde1913 100644
--- a/docs/html/sdk/api_diff/4/changes/android.test.mock.MockContext.html
+++ b/docs/html/sdk/api_diff/4/changes/android.test.mock.MockContext.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.test.mock.MockPackageManager.html b/docs/html/sdk/api_diff/4/changes/android.test.mock.MockPackageManager.html
index 939b9e89f124..2e4fc37b43c6 100644
--- a/docs/html/sdk/api_diff/4/changes/android.test.mock.MockPackageManager.html
+++ b/docs/html/sdk/api_diff/4/changes/android.test.mock.MockPackageManager.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.text.style.ImageSpan.html b/docs/html/sdk/api_diff/4/changes/android.text.style.ImageSpan.html
index 729d9ef161f1..b4eb16154501 100644
--- a/docs/html/sdk/api_diff/4/changes/android.text.style.ImageSpan.html
+++ b/docs/html/sdk/api_diff/4/changes/android.text.style.ImageSpan.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.util.Config.html b/docs/html/sdk/api_diff/4/changes/android.util.Config.html
index e5d67d9cf9e8..d6d303ecf6d3 100644
--- a/docs/html/sdk/api_diff/4/changes/android.util.Config.html
+++ b/docs/html/sdk/api_diff/4/changes/android.util.Config.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.util.DisplayMetrics.html b/docs/html/sdk/api_diff/4/changes/android.util.DisplayMetrics.html
index 4ab0b381fffe..d1a482a2f0e9 100644
--- a/docs/html/sdk/api_diff/4/changes/android.util.DisplayMetrics.html
+++ b/docs/html/sdk/api_diff/4/changes/android.util.DisplayMetrics.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.util.TypedValue.html b/docs/html/sdk/api_diff/4/changes/android.util.TypedValue.html
index fd1517274237..bb74b65ff9b4 100644
--- a/docs/html/sdk/api_diff/4/changes/android.util.TypedValue.html
+++ b/docs/html/sdk/api_diff/4/changes/android.util.TypedValue.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.view.Surface.html b/docs/html/sdk/api_diff/4/changes/android.view.Surface.html
index 723191330bc8..a323bee9f636 100644
--- a/docs/html/sdk/api_diff/4/changes/android.view.Surface.html
+++ b/docs/html/sdk/api_diff/4/changes/android.view.Surface.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.view.VelocityTracker.html b/docs/html/sdk/api_diff/4/changes/android.view.VelocityTracker.html
index 208ee0d99ac5..4d9666766c39 100644
--- a/docs/html/sdk/api_diff/4/changes/android.view.VelocityTracker.html
+++ b/docs/html/sdk/api_diff/4/changes/android.view.VelocityTracker.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.view.View.html b/docs/html/sdk/api_diff/4/changes/android.view.View.html
index 1696e1c5187f..45d735b112c0 100644
--- a/docs/html/sdk/api_diff/4/changes/android.view.View.html
+++ b/docs/html/sdk/api_diff/4/changes/android.view.View.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.view.ViewConfiguration.html b/docs/html/sdk/api_diff/4/changes/android.view.ViewConfiguration.html
index 30a66ab37133..aa8d02ae5cee 100644
--- a/docs/html/sdk/api_diff/4/changes/android.view.ViewConfiguration.html
+++ b/docs/html/sdk/api_diff/4/changes/android.view.ViewConfiguration.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.view.Window.Callback.html b/docs/html/sdk/api_diff/4/changes/android.view.Window.Callback.html
index 61626bd8c0f0..de1d3547524f 100644
--- a/docs/html/sdk/api_diff/4/changes/android.view.Window.Callback.html
+++ b/docs/html/sdk/api_diff/4/changes/android.view.Window.Callback.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.widget.AutoCompleteTextView.html b/docs/html/sdk/api_diff/4/changes/android.widget.AutoCompleteTextView.html
index 2ad8c43c8531..bad2b22ced46 100644
--- a/docs/html/sdk/api_diff/4/changes/android.widget.AutoCompleteTextView.html
+++ b/docs/html/sdk/api_diff/4/changes/android.widget.AutoCompleteTextView.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.widget.CheckedTextView.html b/docs/html/sdk/api_diff/4/changes/android.widget.CheckedTextView.html
index 91675dc86577..79e40a8b60f3 100644
--- a/docs/html/sdk/api_diff/4/changes/android.widget.CheckedTextView.html
+++ b/docs/html/sdk/api_diff/4/changes/android.widget.CheckedTextView.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.widget.ListView.html b/docs/html/sdk/api_diff/4/changes/android.widget.ListView.html
index 37680eb262bd..487c69b337ea 100644
--- a/docs/html/sdk/api_diff/4/changes/android.widget.ListView.html
+++ b/docs/html/sdk/api_diff/4/changes/android.widget.ListView.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.widget.PopupWindow.html b/docs/html/sdk/api_diff/4/changes/android.widget.PopupWindow.html
index e97e296d6f16..6ce83af6e85a 100644
--- a/docs/html/sdk/api_diff/4/changes/android.widget.PopupWindow.html
+++ b/docs/html/sdk/api_diff/4/changes/android.widget.PopupWindow.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.widget.TabHost.TabSpec.html b/docs/html/sdk/api_diff/4/changes/android.widget.TabHost.TabSpec.html
index 639b4665b137..8940867ba224 100644
--- a/docs/html/sdk/api_diff/4/changes/android.widget.TabHost.TabSpec.html
+++ b/docs/html/sdk/api_diff/4/changes/android.widget.TabHost.TabSpec.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/android.widget.TabWidget.html b/docs/html/sdk/api_diff/4/changes/android.widget.TabWidget.html
index beb40561236a..17b2a5edba2f 100644
--- a/docs/html/sdk/api_diff/4/changes/android.widget.TabWidget.html
+++ b/docs/html/sdk/api_diff/4/changes/android.widget.TabWidget.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/changes-summary.html b/docs/html/sdk/api_diff/4/changes/changes-summary.html
index d4b794c1139e..a4850a52a193 100644
--- a/docs/html/sdk/api_diff/4/changes/changes-summary.html
+++ b/docs/html/sdk/api_diff/4/changes/changes-summary.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/classes_index_additions.html b/docs/html/sdk/api_diff/4/changes/classes_index_additions.html
index 8100cfc1418f..d59f6660d467 100644
--- a/docs/html/sdk/api_diff/4/changes/classes_index_additions.html
+++ b/docs/html/sdk/api_diff/4/changes/classes_index_additions.html
@@ -57,6 +57,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.graphics.drawable.html#Animatable" class="hiddenlink" target="rightframe"><b><i>Animatable</i></b></A><br>
@@ -72,6 +73,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.view.animation.html#BounceInterpolator" class="hiddenlink" target="rightframe"><b>BounceInterpolator</b></A><br>
@@ -86,6 +88,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.opengl.html#GLES10" class="hiddenlink" target="rightframe"><b>GLES10</b></A><br>
@@ -102,6 +105,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.content.html#IntentSender" class="hiddenlink" target="rightframe"><b>IntentSender</b></A><br>
@@ -117,6 +121,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.view.animation.html#OvershootInterpolator" class="hiddenlink" target="rightframe"><b>OvershootInterpolator</b></A><br>
@@ -130,6 +135,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.content.pm.html#PathPermission" class="hiddenlink" target="rightframe"><b>PathPermission</b></A><br>
@@ -143,6 +149,7 @@ body{overflow:auto;}
 <a href="#P"><font size="-2">P</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.telephony.html#SmsManager" class="hiddenlink" target="rightframe"><b>SmsManager</b></A><br>
@@ -159,6 +166,7 @@ body{overflow:auto;}
 <a href="#P"><font size="-2">P</font></a> 
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.view.html#ViewDebug.FlagToString" class="hiddenlink" target="rightframe"><b>ViewDebug.FlagToString</b></A><br>
@@ -172,9 +180,25 @@ body{overflow:auto;}
 <a href="#P"><font size="-2">P</font></a> 
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.net.wifi.html#WifiManager.MulticastLock" class="hiddenlink" target="rightframe"><b>WifiManager.MulticastLock</b></A><br>
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#ZoomButtonsController" class="hiddenlink" target="rightframe"><b>ZoomButtonsController</b></A><br>
+<A HREF="pkg_android.widget.html#ZoomButtonsController.OnZoomListener" class="hiddenlink" target="rightframe"><b><i>ZoomButtonsController.OnZoomListener</i></b></A><br>
 <script src="http://www.google-analytics.com/ga.js" type="text/javascript">
 </script>
 <script type="text/javascript">
diff --git a/docs/html/sdk/api_diff/4/changes/classes_index_all.html b/docs/html/sdk/api_diff/4/changes/classes_index_all.html
index 667a433a0025..4af271601e26 100644
--- a/docs/html/sdk/api_diff/4/changes/classes_index_all.html
+++ b/docs/html/sdk/api_diff/4/changes/classes_index_all.html
@@ -65,6 +65,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.app.Activity.html" class="hiddenlink" target="rightframe">Activity</A><br>
@@ -96,6 +97,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.graphics.Bitmap.html" class="hiddenlink" target="rightframe">Bitmap</A><br>
@@ -124,6 +126,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.graphics.Canvas.html" class="hiddenlink" target="rightframe">Canvas</A><br>
@@ -153,6 +156,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="java.util.Date.html" class="hiddenlink" target="rightframe">Date</A><br>
@@ -177,6 +181,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.opengl.html#GLES10" class="hiddenlink" target="rightframe"><b>GLES10</b></A><br>
@@ -201,6 +206,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.text.style.ImageSpan.html" class="hiddenlink" target="rightframe">ImageSpan</A><br>
@@ -228,6 +234,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.inputmethodservice.KeyboardView.html" class="hiddenlink" target="rightframe">KeyboardView</A><br>
@@ -249,6 +256,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.app.LauncherActivity.html" class="hiddenlink" target="rightframe">LauncherActivity</A><br>
@@ -272,6 +280,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.Manifest.permission.html" class="hiddenlink" target="rightframe">Manifest.permission</A><br>
@@ -300,6 +309,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.graphics.NinePatch.html" class="hiddenlink" target="rightframe">NinePatch</A><br>
@@ -322,6 +332,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="pkg_android.view.animation.html#OvershootInterpolator" class="hiddenlink" target="rightframe"><b>OvershootInterpolator</b></A><br>
@@ -343,6 +354,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.content.pm.PackageManager.html" class="hiddenlink" target="rightframe">PackageManager</A><br>
@@ -368,18 +380,12 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.R.anim.html" class="hiddenlink" target="rightframe">R.anim</A><br>
-<A HREF="android.R.array.html" class="hiddenlink" target="rightframe">R.array</A><br>
 <A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
-<A HREF="android.R.color.html" class="hiddenlink" target="rightframe">R.color</A><br>
-<A HREF="android.R.dimen.html" class="hiddenlink" target="rightframe">R.dimen</A><br>
 <A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
-<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
-<A HREF="android.R.integer.html" class="hiddenlink" target="rightframe">R.integer</A><br>
-<A HREF="android.R.layout.html" class="hiddenlink" target="rightframe">R.layout</A><br>
-<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
 <A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
 <A HREF="android.os.RemoteCallbackList.html" class="hiddenlink" target="rightframe">RemoteCallbackList</A><br>
 <A NAME="S"></A>
@@ -400,6 +406,7 @@ body{overflow:auto;}
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.app.SearchManager.html" class="hiddenlink" target="rightframe">SearchManager</A><br>
@@ -439,6 +446,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.widget.TabHost.TabSpec.html" class="hiddenlink" target="rightframe">TabHost.TabSpec</A><br>
@@ -464,6 +472,7 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#W"><font size="-2">W</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.view.VelocityTracker.html" class="hiddenlink" target="rightframe">VelocityTracker</A><br>
@@ -488,11 +497,35 @@ body{overflow:auto;}
 <a href="#S"><font size="-2">S</font></a> 
 <a href="#T"><font size="-2">T</font></a> 
 <a href="#V"><font size="-2">V</font></a> 
+<a href="#Z"><font size="-2">Z</font></a> 
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.net.wifi.WifiManager.html" class="hiddenlink" target="rightframe">WifiManager</A><br>
 <A HREF="pkg_android.net.wifi.html#WifiManager.MulticastLock" class="hiddenlink" target="rightframe"><b>WifiManager.MulticastLock</b></A><br>
 <A HREF="android.view.Window.Callback.html" class="hiddenlink" target="rightframe"><i>Window.Callback</i></A><br>
+<A NAME="Z"></A>
+<br><font size="+2">Z</font>&nbsp;
+<a href="#A"><font size="-2">A</font></a> 
+<a href="#B"><font size="-2">B</font></a> 
+<a href="#C"><font size="-2">C</font></a> 
+<a href="#D"><font size="-2">D</font></a> 
+<a href="#G"><font size="-2">G</font></a> 
+<a href="#I"><font size="-2">I</font></a> 
+<a href="#K"><font size="-2">K</font></a> 
+<a href="#L"><font size="-2">L</font></a> 
+<a href="#M"><font size="-2">M</font></a> 
+<a href="#N"><font size="-2">N</font></a> 
+<a href="#O"><font size="-2">O</font></a> 
+<a href="#P"><font size="-2">P</font></a> 
+<a href="#R"><font size="-2">R</font></a> 
+<a href="#S"><font size="-2">S</font></a> 
+<a href="#T"><font size="-2">T</font></a> 
+<a href="#V"><font size="-2">V</font></a> 
+<a href="#W"><font size="-2">W</font></a> 
+ <a href="#topheader"><font size="-2">TOP</font></a>
+<p><div style="line-height:1.5em;color:black">
+<A HREF="pkg_android.widget.html#ZoomButtonsController" class="hiddenlink" target="rightframe"><b>ZoomButtonsController</b></A><br>
+<A HREF="pkg_android.widget.html#ZoomButtonsController.OnZoomListener" class="hiddenlink" target="rightframe"><b><i>ZoomButtonsController.OnZoomListener</i></b></A><br>
 <script src="http://www.google-analytics.com/ga.js" type="text/javascript">
 </script>
 <script type="text/javascript">
diff --git a/docs/html/sdk/api_diff/4/changes/classes_index_changes.html b/docs/html/sdk/api_diff/4/changes/classes_index_changes.html
index 246e64ba0579..193e21cb5687 100644
--- a/docs/html/sdk/api_diff/4/changes/classes_index_changes.html
+++ b/docs/html/sdk/api_diff/4/changes/classes_index_changes.html
@@ -293,15 +293,8 @@ body{overflow:auto;}
  <a href="#topheader"><font size="-2">TOP</font></a>
 <p><div style="line-height:1.5em;color:black">
 <A HREF="android.R.anim.html" class="hiddenlink" target="rightframe">R.anim</A><br>
-<A HREF="android.R.array.html" class="hiddenlink" target="rightframe">R.array</A><br>
 <A HREF="android.R.attr.html" class="hiddenlink" target="rightframe">R.attr</A><br>
-<A HREF="android.R.color.html" class="hiddenlink" target="rightframe">R.color</A><br>
-<A HREF="android.R.dimen.html" class="hiddenlink" target="rightframe">R.dimen</A><br>
 <A HREF="android.R.drawable.html" class="hiddenlink" target="rightframe">R.drawable</A><br>
-<A HREF="android.R.id.html" class="hiddenlink" target="rightframe">R.id</A><br>
-<A HREF="android.R.integer.html" class="hiddenlink" target="rightframe">R.integer</A><br>
-<A HREF="android.R.layout.html" class="hiddenlink" target="rightframe">R.layout</A><br>
-<A HREF="android.R.string.html" class="hiddenlink" target="rightframe">R.string</A><br>
 <A HREF="android.R.style.html" class="hiddenlink" target="rightframe">R.style</A><br>
 <A HREF="android.os.RemoteCallbackList.html" class="hiddenlink" target="rightframe">RemoteCallbackList</A><br>
 <A NAME="S"></A>
diff --git a/docs/html/sdk/api_diff/4/changes/fields_index_additions.html b/docs/html/sdk/api_diff/4/changes/fields_index_additions.html
index 6a500b451e9a..8ab19bae74aa 100644
--- a/docs/html/sdk/api_diff/4/changes/fields_index_additions.html
+++ b/docs/html/sdk/api_diff/4/changes/fields_index_additions.html
@@ -205,721 +205,6 @@ body{overflow:auto;}
 </nobr><br>
 <nobr><A HREF="android.util.DisplayMetrics.html#android.util.DisplayMetrics.densityDpi" class="hiddenlink" target="rightframe">densityDpi</A>
 </nobr><br>
-<i>donut_resource_pad1</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad10</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad11</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad12</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad13</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad14</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad15</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad16</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad17</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad18</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad19</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad2</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad20</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad21</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad22</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad23</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad24</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad25</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad26</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad27</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad28</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<i>donut_resource_pad29</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<i>donut_resource_pad3</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad30</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<i>donut_resource_pad31</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad32" class="hiddenlink" target="rightframe">donut_resource_pad32</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad33" class="hiddenlink" target="rightframe">donut_resource_pad33</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad34" class="hiddenlink" target="rightframe">donut_resource_pad34</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad35" class="hiddenlink" target="rightframe">donut_resource_pad35</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad36" class="hiddenlink" target="rightframe">donut_resource_pad36</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad37" class="hiddenlink" target="rightframe">donut_resource_pad37</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad38" class="hiddenlink" target="rightframe">donut_resource_pad38</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad39" class="hiddenlink" target="rightframe">donut_resource_pad39</A>
-</nobr><br>
-<i>donut_resource_pad4</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad40" class="hiddenlink" target="rightframe">donut_resource_pad40</A>
-</nobr><br>
-<i>donut_resource_pad5</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad6</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad7</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad8</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad9</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
 <nobr><A HREF="android.R.attr.html#android.R.attr.dropDownHeight" class="hiddenlink" target="rightframe">dropDownHeight</A>
 </nobr><br>
 <A NAME="E"></A>
diff --git a/docs/html/sdk/api_diff/4/changes/fields_index_all.html b/docs/html/sdk/api_diff/4/changes/fields_index_all.html
index db767782fefc..3d155b7bfa7e 100644
--- a/docs/html/sdk/api_diff/4/changes/fields_index_all.html
+++ b/docs/html/sdk/api_diff/4/changes/fields_index_all.html
@@ -214,721 +214,6 @@ body{overflow:auto;}
 </nobr><br>
 <nobr><A HREF="android.util.DisplayMetrics.html#android.util.DisplayMetrics.densityDpi" class="hiddenlink" target="rightframe">densityDpi</A>
 </nobr><br>
-<i>donut_resource_pad1</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad1" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad10</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad10" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad11</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad11" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad12</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad12" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad13</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad13" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad14</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad14" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad15</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad15" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad16</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad16" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad17</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad17" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad18</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad18" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad19</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad19" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad2</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad2" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad20</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad20" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad21</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad21" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad22</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad22" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad23</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad23" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad24</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad24" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad25</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad25" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad26</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad26" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad27</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad27" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-<i>donut_resource_pad28</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad28" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<i>donut_resource_pad29</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad29" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<i>donut_resource_pad3</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad3" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad30</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad30" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<i>donut_resource_pad31</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad31" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad32" class="hiddenlink" target="rightframe">donut_resource_pad32</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad33" class="hiddenlink" target="rightframe">donut_resource_pad33</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad34" class="hiddenlink" target="rightframe">donut_resource_pad34</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad35" class="hiddenlink" target="rightframe">donut_resource_pad35</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad36" class="hiddenlink" target="rightframe">donut_resource_pad36</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad37" class="hiddenlink" target="rightframe">donut_resource_pad37</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad38" class="hiddenlink" target="rightframe">donut_resource_pad38</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad39" class="hiddenlink" target="rightframe">donut_resource_pad39</A>
-</nobr><br>
-<i>donut_resource_pad4</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad4" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad40" class="hiddenlink" target="rightframe">donut_resource_pad40</A>
-</nobr><br>
-<i>donut_resource_pad5</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad5" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad6</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad6" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad7</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad7" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad8</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad8" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
-<i>donut_resource_pad9</i><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.anim.html#android.R.anim.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.anim</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.array.html#android.R.array.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.array</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.attr.html#android.R.attr.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.attr</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.color.html#android.R.color.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.color</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.dimen.html#android.R.dimen.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.dimen</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.drawable.html#android.R.drawable.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.drawable</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.id.html#android.R.id.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.id</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.integer.html#android.R.integer.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.integer</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.layout.html#android.R.layout.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.layout</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.string.html#android.R.string.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.string</A>
-</nobr><br>
-&nbsp;in&nbsp;
-<nobr><A HREF="android.R.style.html#android.R.style.donut_resource_pad9" class="hiddenlink" target="rightframe">android.R.style</A>
-</nobr><br>
 <nobr><A HREF="android.R.attr.html#android.R.attr.dropDownHeight" class="hiddenlink" target="rightframe">dropDownHeight</A>
 </nobr><br>
 <A NAME="E"></A>
diff --git a/docs/html/sdk/api_diff/4/changes/java.lang.String.html b/docs/html/sdk/api_diff/4/changes/java.lang.String.html
index 1e19474a97d3..61a6945f332b 100644
--- a/docs/html/sdk/api_diff/4/changes/java.lang.String.html
+++ b/docs/html/sdk/api_diff/4/changes/java.lang.String.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/java.net.Socket.html b/docs/html/sdk/api_diff/4/changes/java.net.Socket.html
index 0d1cf765ff5a..bbeeab95f0ae 100644
--- a/docs/html/sdk/api_diff/4/changes/java.net.Socket.html
+++ b/docs/html/sdk/api_diff/4/changes/java.net.Socket.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/java.util.Date.html b/docs/html/sdk/api_diff/4/changes/java.util.Date.html
index 69caada0003c..13acc8dff19f 100644
--- a/docs/html/sdk/api_diff/4/changes/java.util.Date.html
+++ b/docs/html/sdk/api_diff/4/changes/java.util.Date.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/jdiff_help.html b/docs/html/sdk/api_diff/4/changes/jdiff_help.html
index b414f6281d4d..f4b996891fa9 100644
--- a/docs/html/sdk/api_diff/4/changes/jdiff_help.html
+++ b/docs/html/sdk/api_diff/4/changes/jdiff_help.html
@@ -31,7 +31,7 @@ body{overflow:auto;}
 <TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
   <TABLE summary="Navigation bar" BORDER="0" CELLPADDING="0" CELLSPACING="3">
     <TR ALIGN="center" VALIGN="top">
-      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../reference/index.html" target="_top"><FONT CLASS="NavBarFont1"><B><code>Donut</code></B></FONT></A>&nbsp;</TD>
+      <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../reference/index.html" target="_top"><FONT CLASS="NavBarFont1"><B><code>4</code></B></FONT></A>&nbsp;</TD>
       <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="changes-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
       <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> &nbsp;<FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
       <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1"> &nbsp;<FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
diff --git a/docs/html/sdk/api_diff/4/changes/jdiff_statistics.html b/docs/html/sdk/api_diff/4/changes/jdiff_statistics.html
index 3fafb7a6a8ea..3244a173a4f8 100644
--- a/docs/html/sdk/api_diff/4/changes/jdiff_statistics.html
+++ b/docs/html/sdk/api_diff/4/changes/jdiff_statistics.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Version:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Version:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -105,10 +105,6 @@ added, the change will be 100%. Values are rounded here, so a value of 0% indica
   <TD><A HREF="pkg_android.telephony.html">android.telephony</A></TD>
 </TR>
 <TR>
-  <TD ALIGN="center">21</TD>
-  <TD><A HREF="pkg_android.html">android</A></TD>
-</TR>
-<TR>
   <TD ALIGN="center">16</TD>
   <TD><A HREF="pkg_android.opengl.html">android.opengl</A></TD>
 </TR>
@@ -146,6 +142,14 @@ added, the change will be 100%. Values are rounded here, so a value of 0% indica
 </TR>
 <TR>
   <TD ALIGN="center">1</TD>
+  <TD><A HREF="pkg_android.html">android</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
+  <TD><A HREF="pkg_android.widget.html">android.widget</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
   <TD><A HREF="pkg_android.app.html">android.app</A></TD>
 </TR>
 <TR>
@@ -178,10 +182,6 @@ added, the change will be 100%. Values are rounded here, so a value of 0% indica
 </TR>
 <TR>
   <TD ALIGN="center">&lt;1</TD>
-  <TD><A HREF="pkg_android.widget.html">android.widget</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">&lt;1</TD>
   <TD><A HREF="pkg_android.provider.html">android.provider</A></TD>
 </TR>
 <TR>
@@ -214,32 +214,12 @@ added, the change will be 100%. Values are rounded here, so a value of 0% indica
   <TH><b>Class or <i>Interface</i></b></TH>
 </TR>
 <TR>
-  <TD ALIGN="center">63</TD>
-  <TD><A HREF="android.R.dimen.html">
-android.R.dimen</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">63</TD>
-  <TD><A HREF="android.R.integer.html">
-android.R.integer</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">61</TD>
-  <TD><A HREF="android.R.anim.html">
-android.R.anim</A></TD>
-</TR>
-<TR>
   <TD ALIGN="center">55</TD>
   <TD><A HREF="android.telephony.gsm.SmsMessage.html">
 android.telephony.gsm.SmsMessage</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">50</TD>
-  <TD><A HREF="android.R.array.html">
-android.R.array</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">50</TD>
   <TD><A HREF="android.media.ToneGenerator.html">
 android.media.ToneGenerator</A></TD>
 </TR>
@@ -259,21 +239,11 @@ android.telephony.gsm.SmsMessage.SubmitPdu</A></TD>
 android.graphics.drawable.NinePatchDrawable</A></TD>
 </TR>
 <TR>
-  <TD ALIGN="center">44</TD>
-  <TD><A HREF="android.R.color.html">
-android.R.color</A></TD>
-</TR>
-<TR>
   <TD ALIGN="center">42</TD>
   <TD><A HREF="android.media.MediaRecorder.AudioSource.html">
 android.media.MediaRecorder.AudioSource</A></TD>
 </TR>
 <TR>
-  <TD ALIGN="center">36</TD>
-  <TD><A HREF="android.R.string.html">
-android.R.string</A></TD>
-</TR>
-<TR>
   <TD ALIGN="center">33</TD>
   <TD><A HREF="android.util.Config.html">
 android.util.Config</A></TD>
@@ -290,8 +260,8 @@ android.telephony.gsm.SmsMessage.MessageClass</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">23</TD>
-  <TD><A HREF="android.R.layout.html">
-android.R.layout</A></TD>
+  <TD><A HREF="android.R.anim.html">
+android.R.anim</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">23</TD>
@@ -325,11 +295,6 @@ android.graphics.drawable.BitmapDrawable</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">20</TD>
-  <TD><A HREF="android.R.id.html">
-android.R.id</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">20</TD>
   <TD><A HREF="android.test.AndroidTestCase.html">
 android.test.AndroidTestCase</A></TD>
 </TR>
@@ -365,21 +330,11 @@ android.content.pm.ConfigurationInfo</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">11</TD>
-  <TD><A HREF="android.R.drawable.html">
-android.R.drawable</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">11</TD>
   <TD><A HREF="android.app.LauncherActivity.html">
 android.app.LauncherActivity</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">10</TD>
-  <TD><A HREF="android.R.style.html">
-android.R.style</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">10</TD>
   <TD><A HREF="android.content.res.Configuration.html">
 android.content.res.Configuration</A></TD>
 </TR>
@@ -475,11 +430,6 @@ android.Manifest.permission</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">4</TD>
-  <TD><A HREF="android.R.attr.html">
-android.R.attr</A></TD>
-</TR>
-<TR>
-  <TD ALIGN="center">4</TD>
   <TD><A HREF="android.content.pm.ProviderInfo.html">
 android.content.pm.ProviderInfo</A></TD>
 </TR>
@@ -510,6 +460,11 @@ android.widget.PopupWindow</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">2</TD>
+  <TD><A HREF="android.R.attr.html">
+android.R.attr</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">2</TD>
   <TD><A HREF="android.content.Intent.html">
 android.content.Intent</A></TD>
 </TR>
@@ -555,6 +510,11 @@ android.test.mock.MockPackageManager</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">1</TD>
+  <TD><A HREF="android.R.style.html">
+android.R.style</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">1</TD>
   <TD><A HREF="android.widget.ListView.html">
 android.widget.ListView</A></TD>
 </TR>
@@ -605,6 +565,11 @@ android.app.Dialog</A></TD>
 </TR>
 <TR>
   <TD ALIGN="center">&lt;1</TD>
+  <TD><A HREF="android.R.drawable.html">
+android.R.drawable</A></TD>
+</TR>
+<TR>
+  <TD ALIGN="center">&lt;1</TD>
   <TD><A HREF="android.provider.Settings.System.html">
 android.provider.Settings.System</A></TD>
 </TR>
@@ -642,9 +607,9 @@ The table below lists the numbers of program elements (packages, classes, constr
 <TR>
   <TD>Classes and <i>Interfaces</i></TD>
   <TD ALIGN="right">2</TD>
-  <TD ALIGN="right">20</TD>
-  <TD ALIGN="right">80</TD>
-  <TD ALIGN="right">102</TD>
+  <TD ALIGN="right">22</TD>
+  <TD ALIGN="right">73</TD>
+  <TD ALIGN="right">97</TD>
 </TR>
 <TR>
   <TD>Constructors</TD>
@@ -663,16 +628,16 @@ The table below lists the numbers of program elements (packages, classes, constr
 <TR>
   <TD>Fields</TD>
   <TD ALIGN="right">29</TD>
-  <TD ALIGN="right">433</TD>
+  <TD ALIGN="right">202</TD>
   <TD ALIGN="right">27</TD>
-  <TD ALIGN="right">489</TD>
+  <TD ALIGN="right">258</TD>
 </TR>
 <TR>
   <TD><b>Total</b></TD>
   <TD ALIGN="right">34</TD>
-  <TD ALIGN="right">543</TD>
-  <TD ALIGN="right">197</TD>
-  <TD ALIGN="right">774</TD>
+  <TD ALIGN="right">314</TD>
+  <TD ALIGN="right">190</TD>
+  <TD ALIGN="right">538</TD>
 </TR>
 </TABLE>
       </div>	
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.app.html b/docs/html/sdk/api_diff/4/changes/pkg_android.app.html
index 212abba3ab51..acd66f31f071 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.app.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.app.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.content.html b/docs/html/sdk/api_diff/4/changes/pkg_android.content.html
index 6b07fc40740c..db3f8963cf5d 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.content.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.content.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.content.pm.html b/docs/html/sdk/api_diff/4/changes/pkg_android.content.pm.html
index c8f0d36b8e0a..7bfd1855ce1c 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.content.pm.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.content.pm.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.content.res.html b/docs/html/sdk/api_diff/4/changes/pkg_android.content.res.html
index 2b6d95a314dd..8a07bb270c1a 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.content.res.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.content.res.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.drawable.html b/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.drawable.html
index e8033a31f7bb..3fa65de6cedb 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.drawable.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.drawable.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.html b/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.html
index 3c69a1e75087..6d6caac573b6 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.graphics.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.hardware.html b/docs/html/sdk/api_diff/4/changes/pkg_android.hardware.html
index 5a51d124bb83..ddce23db4e0f 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.hardware.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.hardware.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.html b/docs/html/sdk/api_diff/4/changes/pkg_android.html
index 8ea8efecbe26..596b5c1d3cb3 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -102,13 +102,6 @@ Package <A HREF="../../../../reference/android/package-summary.html" target="_to
 </TR>
 <TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
   <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.array"></A>
-  <nobr><A HREF="android.R.array.html">R.array</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
   <A NAME="R.attr"></A>
   <nobr><A HREF="android.R.attr.html">R.attr</A></nobr>
   </TD>
@@ -116,20 +109,6 @@ Package <A HREF="../../../../reference/android/package-summary.html" target="_to
 </TR>
 <TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
   <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.color"></A>
-  <nobr><A HREF="android.R.color.html">R.color</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.dimen"></A>
-  <nobr><A HREF="android.R.dimen.html">R.dimen</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
   <A NAME="R.drawable"></A>
   <nobr><A HREF="android.R.drawable.html">R.drawable</A></nobr>
   </TD>
@@ -137,34 +116,6 @@ Package <A HREF="../../../../reference/android/package-summary.html" target="_to
 </TR>
 <TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
   <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.id"></A>
-  <nobr><A HREF="android.R.id.html">R.id</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.integer"></A>
-  <nobr><A HREF="android.R.integer.html">R.integer</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.layout"></A>
-  <nobr><A HREF="android.R.layout.html">R.layout</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
-  <A NAME="R.string"></A>
-  <nobr><A HREF="android.R.string.html">R.string</A></nobr>
-  </TD>
-  <TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
-  <TD VALIGN="TOP" WIDTH="25%">
   <A NAME="R.style"></A>
   <nobr><A HREF="android.R.style.html">R.style</A></nobr>
   </TD>
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.inputmethodservice.html b/docs/html/sdk/api_diff/4/changes/pkg_android.inputmethodservice.html
index 57913d963788..502727273848 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.inputmethodservice.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.inputmethodservice.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.location.html b/docs/html/sdk/api_diff/4/changes/pkg_android.location.html
index 9c803b4e8524..344b11fd7aa5 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.location.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.location.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.media.html b/docs/html/sdk/api_diff/4/changes/pkg_android.media.html
index 4017876ae8a6..19cf361205bd 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.media.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.media.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.net.wifi.html b/docs/html/sdk/api_diff/4/changes/pkg_android.net.wifi.html
index ad844fd3d2c9..50e527365179 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.net.wifi.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.net.wifi.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.opengl.html b/docs/html/sdk/api_diff/4/changes/pkg_android.opengl.html
index ceb4326ac699..d2483d418b8d 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.opengl.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.opengl.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.os.html b/docs/html/sdk/api_diff/4/changes/pkg_android.os.html
index 175e36541851..dc22fd42fac1 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.os.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.os.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.provider.html b/docs/html/sdk/api_diff/4/changes/pkg_android.provider.html
index 44458da5fd6a..87aaaf2e2815 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.provider.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.provider.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.gsm.html b/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.gsm.html
index 0c1fd78fa1e1..176a343ae251 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.gsm.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.gsm.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.html b/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.html
index b6e7b9012d06..a40a526c96b9 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.telephony.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.test.html b/docs/html/sdk/api_diff/4/changes/pkg_android.test.html
index ad91cd43279f..7fa10be303e6 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.test.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.test.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.test.mock.html b/docs/html/sdk/api_diff/4/changes/pkg_android.test.mock.html
index bea2724480c6..6d5a18388706 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.test.mock.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.test.mock.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.text.style.html b/docs/html/sdk/api_diff/4/changes/pkg_android.text.style.html
index d248546be6e0..ab5984826796 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.text.style.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.text.style.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.util.html b/docs/html/sdk/api_diff/4/changes/pkg_android.util.html
index 1efbe7dfdadc..5a936ae45a2b 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.util.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.util.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.view.animation.html b/docs/html/sdk/api_diff/4/changes/pkg_android.view.animation.html
index ed53b79463d9..a88e7fc422d5 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.view.animation.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.view.animation.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.view.html b/docs/html/sdk/api_diff/4/changes/pkg_android.view.html
index dc85219526fe..381a339a130a 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.view.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.view.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_android.widget.html b/docs/html/sdk/api_diff/4/changes/pkg_android.widget.html
index 8a1cb3b5bbb9..1388a0ced739 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_android.widget.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_android.widget.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
@@ -74,6 +74,28 @@ body{overflow:auto;}
 Package <A HREF="../../../../reference/android/widget/package-summary.html" target="_top"><font size="+1"><code>android.widget</code></font></A>
 </H2>
 <p>
+<a NAME="Added"></a>
+<TABLE summary="Added Classes and Interfaces" WIDTH="100%">
+<TR>
+  <TH VALIGN="TOP" COLSPAN=2>Added Classes and Interfaces</FONT></TD>
+</TH>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ZoomButtonsController"></A>
+  <nobr><A HREF="../../../../reference/android/widget/ZoomButtonsController.html" target="_top"><code>ZoomButtonsController</code></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="#FFFFFF" CLASS="TableRowColor">
+  <TD VALIGN="TOP" WIDTH="25%">
+  <A NAME="ZoomButtonsController.OnZoomListener"></A>
+  <nobr><A HREF="../../../../reference/android/widget/ZoomButtonsController.OnZoomListener.html" target="_top"><code><I>ZoomButtonsController.<br>OnZoomListener</I></code></A></nobr>
+  </TD>
+  <TD>&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<p>
 <a NAME="Changed"></a>
 <TABLE summary="Changed Classes" WIDTH="100%">
 <TR>
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_java.lang.html b/docs/html/sdk/api_diff/4/changes/pkg_java.lang.html
index 995f66023e7b..4206681af490 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_java.lang.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_java.lang.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_java.net.html b/docs/html/sdk/api_diff/4/changes/pkg_java.net.html
index 3bacffc3560d..9d981552661d 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_java.net.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_java.net.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/changes/pkg_java.util.html b/docs/html/sdk/api_diff/4/changes/pkg_java.util.html
index 70db301e2ad7..1702f222ba7d 100644
--- a/docs/html/sdk/api_diff/4/changes/pkg_java.util.html
+++ b/docs/html/sdk/api_diff/4/changes/pkg_java.util.html
@@ -46,7 +46,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec" style="padding-top:.25em">To Level:</td>
-        <td class="diffvaluenew" style="padding-top:.25em">Donut</td>
+        <td class="diffvaluenew" style="padding-top:.25em">4</td>
       </tr>
       <tr>
         <td class="diffspec">From Level:</td>
@@ -54,7 +54,7 @@ body{overflow:auto;}
       </tr>
       <tr>
         <td class="diffspec">Generated</td>
-        <td class="diffvalue">2009.08.05 19:20</td>
+        <td class="diffvalue">2009.09.02 18:26</td>
       </tr>
     </table>
     </div><!-- End and-diff-id -->
diff --git a/docs/html/sdk/api_diff/4/missingSinces.txt b/docs/html/sdk/api_diff/4/missingSinces.txt
index 4d35e0f4fe15..2cdddf955df6 100644
--- a/docs/html/sdk/api_diff/4/missingSinces.txt
+++ b/docs/html/sdk/api_diff/4/missingSinces.txt
@@ -18,6 +18,8 @@ NO DOC BLOCK: android.telephony.SmsMessage.MessageClass Class
 NO DOC BLOCK: android.telephony.SmsMessage.SubmitPdu Class
 NO DOC BLOCK: android.view.ViewDebug.FlagToString Class
 NO DOC BLOCK: android.net.wifi.WifiManager.MulticastLock Class
+NO DOC BLOCK: android.widget.ZoomButtonsController Class
+NO DOC BLOCK: android.widget.ZoomButtonsController.OnZoomListener Interface
 NO DOC BLOCK: android.graphics.drawable.BitmapDrawable Constructor (android.content.res.Resources)
 NO DOC BLOCK: android.graphics.drawable.BitmapDrawable Constructor (android.content.res.Resources, android.graphics.Bitmap)
 NO DOC BLOCK: android.text.style.ImageSpan Constructor (android.content.Context, android.graphics.Bitmap)
@@ -134,237 +136,6 @@ NO DOC BLOCK: android.util.DisplayMetrics Field DENSITY_MEDIUM
 NO DOC BLOCK: android.graphics.Bitmap Field DENSITY_NONE
 NO DOC BLOCK: android.util.TypedValue Field DENSITY_NONE
 NO DOC BLOCK: android.util.DisplayMetrics Field densityDpi
-NO DOC BLOCK: android.R.anim Field donut_resource_pad1
-NO DOC BLOCK: android.R.array Field donut_resource_pad1
-NO DOC BLOCK: android.R.attr Field donut_resource_pad1
-NO DOC BLOCK: android.R.color Field donut_resource_pad1
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad1
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad1
-NO DOC BLOCK: android.R.id Field donut_resource_pad1
-NO DOC BLOCK: android.R.integer Field donut_resource_pad1
-NO DOC BLOCK: android.R.layout Field donut_resource_pad1
-NO DOC BLOCK: android.R.string Field donut_resource_pad1
-NO DOC BLOCK: android.R.style Field donut_resource_pad1
-NO DOC BLOCK: android.R.anim Field donut_resource_pad10
-NO DOC BLOCK: android.R.array Field donut_resource_pad10
-NO DOC BLOCK: android.R.attr Field donut_resource_pad10
-NO DOC BLOCK: android.R.color Field donut_resource_pad10
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad10
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad10
-NO DOC BLOCK: android.R.id Field donut_resource_pad10
-NO DOC BLOCK: android.R.integer Field donut_resource_pad10
-NO DOC BLOCK: android.R.layout Field donut_resource_pad10
-NO DOC BLOCK: android.R.string Field donut_resource_pad10
-NO DOC BLOCK: android.R.style Field donut_resource_pad10
-NO DOC BLOCK: android.R.anim Field donut_resource_pad11
-NO DOC BLOCK: android.R.array Field donut_resource_pad11
-NO DOC BLOCK: android.R.attr Field donut_resource_pad11
-NO DOC BLOCK: android.R.color Field donut_resource_pad11
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad11
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad11
-NO DOC BLOCK: android.R.id Field donut_resource_pad11
-NO DOC BLOCK: android.R.integer Field donut_resource_pad11
-NO DOC BLOCK: android.R.layout Field donut_resource_pad11
-NO DOC BLOCK: android.R.string Field donut_resource_pad11
-NO DOC BLOCK: android.R.style Field donut_resource_pad11
-NO DOC BLOCK: android.R.anim Field donut_resource_pad12
-NO DOC BLOCK: android.R.array Field donut_resource_pad12
-NO DOC BLOCK: android.R.attr Field donut_resource_pad12
-NO DOC BLOCK: android.R.color Field donut_resource_pad12
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad12
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad12
-NO DOC BLOCK: android.R.id Field donut_resource_pad12
-NO DOC BLOCK: android.R.integer Field donut_resource_pad12
-NO DOC BLOCK: android.R.layout Field donut_resource_pad12
-NO DOC BLOCK: android.R.string Field donut_resource_pad12
-NO DOC BLOCK: android.R.style Field donut_resource_pad12
-NO DOC BLOCK: android.R.anim Field donut_resource_pad13
-NO DOC BLOCK: android.R.attr Field donut_resource_pad13
-NO DOC BLOCK: android.R.color Field donut_resource_pad13
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad13
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad13
-NO DOC BLOCK: android.R.id Field donut_resource_pad13
-NO DOC BLOCK: android.R.integer Field donut_resource_pad13
-NO DOC BLOCK: android.R.layout Field donut_resource_pad13
-NO DOC BLOCK: android.R.string Field donut_resource_pad13
-NO DOC BLOCK: android.R.style Field donut_resource_pad13
-NO DOC BLOCK: android.R.anim Field donut_resource_pad14
-NO DOC BLOCK: android.R.attr Field donut_resource_pad14
-NO DOC BLOCK: android.R.color Field donut_resource_pad14
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad14
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad14
-NO DOC BLOCK: android.R.id Field donut_resource_pad14
-NO DOC BLOCK: android.R.integer Field donut_resource_pad14
-NO DOC BLOCK: android.R.string Field donut_resource_pad14
-NO DOC BLOCK: android.R.style Field donut_resource_pad14
-NO DOC BLOCK: android.R.anim Field donut_resource_pad15
-NO DOC BLOCK: android.R.attr Field donut_resource_pad15
-NO DOC BLOCK: android.R.color Field donut_resource_pad15
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad15
-NO DOC BLOCK: android.R.id Field donut_resource_pad15
-NO DOC BLOCK: android.R.string Field donut_resource_pad15
-NO DOC BLOCK: android.R.style Field donut_resource_pad15
-NO DOC BLOCK: android.R.anim Field donut_resource_pad16
-NO DOC BLOCK: android.R.attr Field donut_resource_pad16
-NO DOC BLOCK: android.R.color Field donut_resource_pad16
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad16
-NO DOC BLOCK: android.R.id Field donut_resource_pad16
-NO DOC BLOCK: android.R.string Field donut_resource_pad16
-NO DOC BLOCK: android.R.style Field donut_resource_pad16
-NO DOC BLOCK: android.R.anim Field donut_resource_pad17
-NO DOC BLOCK: android.R.attr Field donut_resource_pad17
-NO DOC BLOCK: android.R.color Field donut_resource_pad17
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad17
-NO DOC BLOCK: android.R.id Field donut_resource_pad17
-NO DOC BLOCK: android.R.string Field donut_resource_pad17
-NO DOC BLOCK: android.R.style Field donut_resource_pad17
-NO DOC BLOCK: android.R.anim Field donut_resource_pad18
-NO DOC BLOCK: android.R.attr Field donut_resource_pad18
-NO DOC BLOCK: android.R.color Field donut_resource_pad18
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad18
-NO DOC BLOCK: android.R.id Field donut_resource_pad18
-NO DOC BLOCK: android.R.string Field donut_resource_pad18
-NO DOC BLOCK: android.R.style Field donut_resource_pad18
-NO DOC BLOCK: android.R.anim Field donut_resource_pad19
-NO DOC BLOCK: android.R.color Field donut_resource_pad19
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad19
-NO DOC BLOCK: android.R.id Field donut_resource_pad19
-NO DOC BLOCK: android.R.string Field donut_resource_pad19
-NO DOC BLOCK: android.R.style Field donut_resource_pad19
-NO DOC BLOCK: android.R.anim Field donut_resource_pad2
-NO DOC BLOCK: android.R.array Field donut_resource_pad2
-NO DOC BLOCK: android.R.attr Field donut_resource_pad2
-NO DOC BLOCK: android.R.color Field donut_resource_pad2
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad2
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad2
-NO DOC BLOCK: android.R.id Field donut_resource_pad2
-NO DOC BLOCK: android.R.integer Field donut_resource_pad2
-NO DOC BLOCK: android.R.layout Field donut_resource_pad2
-NO DOC BLOCK: android.R.string Field donut_resource_pad2
-NO DOC BLOCK: android.R.style Field donut_resource_pad2
-NO DOC BLOCK: android.R.anim Field donut_resource_pad20
-NO DOC BLOCK: android.R.color Field donut_resource_pad20
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad20
-NO DOC BLOCK: android.R.id Field donut_resource_pad20
-NO DOC BLOCK: android.R.string Field donut_resource_pad20
-NO DOC BLOCK: android.R.anim Field donut_resource_pad21
-NO DOC BLOCK: android.R.color Field donut_resource_pad21
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad21
-NO DOC BLOCK: android.R.id Field donut_resource_pad21
-NO DOC BLOCK: android.R.string Field donut_resource_pad21
-NO DOC BLOCK: android.R.color Field donut_resource_pad22
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad22
-NO DOC BLOCK: android.R.id Field donut_resource_pad22
-NO DOC BLOCK: android.R.string Field donut_resource_pad22
-NO DOC BLOCK: android.R.color Field donut_resource_pad23
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad23
-NO DOC BLOCK: android.R.string Field donut_resource_pad23
-NO DOC BLOCK: android.R.color Field donut_resource_pad24
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad24
-NO DOC BLOCK: android.R.string Field donut_resource_pad24
-NO DOC BLOCK: android.R.color Field donut_resource_pad25
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad25
-NO DOC BLOCK: android.R.string Field donut_resource_pad25
-NO DOC BLOCK: android.R.color Field donut_resource_pad26
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad26
-NO DOC BLOCK: android.R.string Field donut_resource_pad26
-NO DOC BLOCK: android.R.color Field donut_resource_pad27
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad27
-NO DOC BLOCK: android.R.string Field donut_resource_pad27
-NO DOC BLOCK: android.R.color Field donut_resource_pad28
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad28
-NO DOC BLOCK: android.R.color Field donut_resource_pad29
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad29
-NO DOC BLOCK: android.R.anim Field donut_resource_pad3
-NO DOC BLOCK: android.R.array Field donut_resource_pad3
-NO DOC BLOCK: android.R.attr Field donut_resource_pad3
-NO DOC BLOCK: android.R.color Field donut_resource_pad3
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad3
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad3
-NO DOC BLOCK: android.R.id Field donut_resource_pad3
-NO DOC BLOCK: android.R.integer Field donut_resource_pad3
-NO DOC BLOCK: android.R.layout Field donut_resource_pad3
-NO DOC BLOCK: android.R.string Field donut_resource_pad3
-NO DOC BLOCK: android.R.style Field donut_resource_pad3
-NO DOC BLOCK: android.R.color Field donut_resource_pad30
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad30
-NO DOC BLOCK: android.R.color Field donut_resource_pad31
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad31
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad32
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad33
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad34
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad35
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad36
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad37
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad38
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad39
-NO DOC BLOCK: android.R.anim Field donut_resource_pad4
-NO DOC BLOCK: android.R.array Field donut_resource_pad4
-NO DOC BLOCK: android.R.attr Field donut_resource_pad4
-NO DOC BLOCK: android.R.color Field donut_resource_pad4
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad4
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad4
-NO DOC BLOCK: android.R.id Field donut_resource_pad4
-NO DOC BLOCK: android.R.integer Field donut_resource_pad4
-NO DOC BLOCK: android.R.layout Field donut_resource_pad4
-NO DOC BLOCK: android.R.string Field donut_resource_pad4
-NO DOC BLOCK: android.R.style Field donut_resource_pad4
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad40
-NO DOC BLOCK: android.R.anim Field donut_resource_pad5
-NO DOC BLOCK: android.R.array Field donut_resource_pad5
-NO DOC BLOCK: android.R.attr Field donut_resource_pad5
-NO DOC BLOCK: android.R.color Field donut_resource_pad5
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad5
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad5
-NO DOC BLOCK: android.R.id Field donut_resource_pad5
-NO DOC BLOCK: android.R.integer Field donut_resource_pad5
-NO DOC BLOCK: android.R.layout Field donut_resource_pad5
-NO DOC BLOCK: android.R.string Field donut_resource_pad5
-NO DOC BLOCK: android.R.style Field donut_resource_pad5
-NO DOC BLOCK: android.R.anim Field donut_resource_pad6
-NO DOC BLOCK: android.R.array Field donut_resource_pad6
-NO DOC BLOCK: android.R.attr Field donut_resource_pad6
-NO DOC BLOCK: android.R.color Field donut_resource_pad6
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad6
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad6
-NO DOC BLOCK: android.R.id Field donut_resource_pad6
-NO DOC BLOCK: android.R.integer Field donut_resource_pad6
-NO DOC BLOCK: android.R.layout Field donut_resource_pad6
-NO DOC BLOCK: android.R.string Field donut_resource_pad6
-NO DOC BLOCK: android.R.style Field donut_resource_pad6
-NO DOC BLOCK: android.R.anim Field donut_resource_pad7
-NO DOC BLOCK: android.R.array Field donut_resource_pad7
-NO DOC BLOCK: android.R.attr Field donut_resource_pad7
-NO DOC BLOCK: android.R.color Field donut_resource_pad7
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad7
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad7
-NO DOC BLOCK: android.R.id Field donut_resource_pad7
-NO DOC BLOCK: android.R.integer Field donut_resource_pad7
-NO DOC BLOCK: android.R.layout Field donut_resource_pad7
-NO DOC BLOCK: android.R.string Field donut_resource_pad7
-NO DOC BLOCK: android.R.style Field donut_resource_pad7
-NO DOC BLOCK: android.R.anim Field donut_resource_pad8
-NO DOC BLOCK: android.R.array Field donut_resource_pad8
-NO DOC BLOCK: android.R.attr Field donut_resource_pad8
-NO DOC BLOCK: android.R.color Field donut_resource_pad8
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad8
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad8
-NO DOC BLOCK: android.R.id Field donut_resource_pad8
-NO DOC BLOCK: android.R.integer Field donut_resource_pad8
-NO DOC BLOCK: android.R.layout Field donut_resource_pad8
-NO DOC BLOCK: android.R.string Field donut_resource_pad8
-NO DOC BLOCK: android.R.style Field donut_resource_pad8
-NO DOC BLOCK: android.R.anim Field donut_resource_pad9
-NO DOC BLOCK: android.R.array Field donut_resource_pad9
-NO DOC BLOCK: android.R.attr Field donut_resource_pad9
-NO DOC BLOCK: android.R.color Field donut_resource_pad9
-NO DOC BLOCK: android.R.dimen Field donut_resource_pad9
-NO DOC BLOCK: android.R.drawable Field donut_resource_pad9
-NO DOC BLOCK: android.R.id Field donut_resource_pad9
-NO DOC BLOCK: android.R.integer Field donut_resource_pad9
-NO DOC BLOCK: android.R.layout Field donut_resource_pad9
-NO DOC BLOCK: android.R.string Field donut_resource_pad9
-NO DOC BLOCK: android.R.style Field donut_resource_pad9
 NO DOC BLOCK: android.R.attr Field dropDownHeight
 NO DOC BLOCK: android.provider.Settings.Secure Field ENABLED_ACCESSIBILITY_SERVICES
 NO DOC BLOCK: android.R.attr Field eventsInterceptionEnabled
diff --git a/docs/html/sdk/api_diff/4/user_comments_for_3_to_Donut.xml b/docs/html/sdk/api_diff/4/user_comments_for_3_to_4.xml
index 5bbe9459a5e2..b0aba964ec01 100644
--- a/docs/html/sdk/api_diff/4/user_comments_for_3_to_Donut.xml
+++ b/docs/html/sdk/api_diff/4/user_comments_for_3_to_4.xml
@@ -2,7 +2,7 @@
 <comments
   xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
   xsi:noNamespaceSchemaLocation='comments.xsd'
-  name="3_to_Donut"
+  name="3_to_4"
   jdversion="1.1.0">
 
 <!-- Use this file to enter an API change description. For example, when you remove a class, 
@@ -130,132 +130,6 @@
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.anim.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad19"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad20"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad21"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.anim.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.R.anim.linear_interpolator"/>
   <text>
     InsertCommentsHere
@@ -268,84 +142,6 @@
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.array"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.array.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.R.attr"/>
   <text>
     InsertCommentsHere
@@ -382,114 +178,6 @@
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.attr.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.attr.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.R.attr.dropDownHeight"/>
   <text>
     InsertCommentsHere
@@ -676,534 +364,12 @@
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.color"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad19"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad20"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad21"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad22"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad23"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad24"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad25"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad26"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad27"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad28"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad29"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad30"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad31"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.color.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.dimen.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.R.drawable"/>
   <text>
     InsertCommentsHere
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.drawable.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad19"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad20"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad21"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad22"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad23"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad24"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad25"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad26"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad27"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad28"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad29"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad30"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad31"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad32"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad33"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad34"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad35"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad36"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad37"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad38"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad39"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad40"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.drawable.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.R.drawable.stat_sys_vp_phone_call"/>
   <text>
     InsertCommentsHere
@@ -1216,486 +382,6 @@
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.id"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad19"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad20"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad21"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad22"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.id.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.integer.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.layout.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad19"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad20"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad21"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad22"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad23"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad24"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad25"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad26"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad27"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.string.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.R.style"/>
   <text>
     InsertCommentsHere
@@ -1720,120 +406,6 @@
   </text>
 </comment>
 <comment>
-  <identifier id="android.R.style.donut_resource_pad1"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad10"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad11"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad12"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad13"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad14"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad15"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad16"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad17"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad18"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad19"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad2"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad3"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad4"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad5"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad6"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad7"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad8"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
-  <identifier id="android.R.style.donut_resource_pad9"/>
-  <text>
-    InsertCommentsHere
-  </text>
-</comment>
-<comment>
   <identifier id="android.accessibilityservice"/>
   <text>
     InsertCommentsHere
@@ -4564,6 +3136,18 @@
   </text>
 </comment>
 <comment>
+  <identifier id="android.widget.ZoomButtonsController"/>
+  <text>
+    InsertCommentsHere
+  </text>
+</comment>
+<comment>
+  <identifier id="android.widget.ZoomButtonsController.OnZoomListener"/>
+  <text>
+    InsertCommentsHere
+  </text>
+</comment>
+<comment>
   <identifier id="java.lang"/>
   <text>
     InsertCommentsHere
diff --git a/docs/html/sdk/preview/features.jd b/docs/html/sdk/preview/features.jd
new file mode 100644
index 000000000000..81b4ff63cb1f
--- /dev/null
+++ b/docs/html/sdk/preview/features.jd
@@ -0,0 +1,4 @@
+sdk.redirect=true
+
+@jd:body
+
diff --git a/docs/html/sdk/preview/index.jd b/docs/html/sdk/preview/index.jd
index a6a6ca278cf9..81b4ff63cb1f 100644
--- a/docs/html/sdk/preview/index.jd
+++ b/docs/html/sdk/preview/index.jd
@@ -1,194 +1,4 @@
-page.title=Android 1.6 Early Look SDK
-sdk.redirect=0
-sdk.version=1.6
-sdk.preview=true
-
-sdk.date=August 2009
-
-sdk.win_download=android-sdk-windows-1.5_r3.zip
-sdk.win_bytes=191477853
-sdk.win_checksum=1725fd6963ce69102ba7192568dfc711
-
-sdk.mac_download=android-sdk-mac_x86-1.5_r3.zip
-sdk.mac_bytes=183024673
-sdk.mac_checksum=b1bafdaefdcec89a14b604b504e7daec
-
-sdk.linux_download=android-sdk-linux_x86-1.5_r3.zip
-sdk.linux_bytes=178117561
-sdk.linux_checksum=350d0211678ced38da926b8c9ffa4fac
-
-adt.zip_download=ADT-0.9.2.zip
-adt.zip_version=0.9.2
-adt.zip_bytes=178117561
-adt.zip_checksum=350d0211678ced38da926b8c9ffa4fac
+sdk.redirect=true
 
 @jd:body
 
-<h2 id="overview">SDK Overview</h2>
-
-<p>This Early Look SDK provides the tools, libraries, and system images that you need to start developing and testing applications on the next version of the Android platform &mdash; Android 1.6.</p>
-
-<p>The sections below provide information about the contents of the SDK, as well as any applicable release notes.</p>
-
-<p>This Early Look SDK is provided for development and testing purposes only. You can use it to get familiar with the new Android 1.6 framework APIs and the UI and features of the Android 1.6 system, and you can use it to begin testing your existing applications with the new API and system. However, this SDK is not suitable for compiling applications for deployment to Android-powered devices running the Android 1.6 platform, when such devices are available. For more information, see <a href="#provisional">Framework API and Provisional API Level</a>. </p>
-
-<p>The sections below provide information about the contents of the SDK, as well as any applicable release notes.</p>
-
-<p class="note"><strong>Note:</strong> This is an <em>early look SDK only</em>. 
-The tools and documentation are not complete. The API reference documentation for the early look 
-SDK is provided only in the downloadable SDK package &mdash; documentation for this early 
-look release is <em>not</em> available at <a href="http://developer.android.com">http://developer.android.com</a>. 
-To access the API reference for the early
-look SDK, see the documentation in your SDK's <em>docs/reference/</em> directory.
-<br/><br/>
-Additionally, note that the APIs provided in this SDK are subject to change until the final 
-Android 1.6 SDK is released. You should not compile any applications for distribution using 
-this version of the SDK. If you do so, your applications will not function properly when deployed 
-to Android-powered devices running the final Android 1.6 platform. Please wait for the final 
-Android 1.6 SDK before distributing applications built on the Android 1.6 system image.
-</p>
-
-<h3 id="provisional">Framework API and Provisional API Level</h3>
-
-<p>This SDK gives you early access to the framework API that will be offered in Android 1.6. However, at the time of this release, The API specification for Android 1.6 was not yet final, meaning that it is possible that the API could change before the final release of the Android 1.6 platform. </p>
-
-<p>To help distinguish the API offered in the Early Look SDK from that of the final Android 1.6 platform, this SDK assigns a provisional API Level identifier &mdash; <strong>Donut</strong> &mdash; to its Early Look framework API. When the Android 1.6 framework API specification is final, the API Level identifier will change to <strong>4</strong> and the "Donut" identifier will no longer be supported. </p>
-
-<p>The "Donut" framework API is for development only and is not supported as a platform for compiling applications for deployment or publishing. The API Level of "Donut" will not be supported by any Android-powered devices in the field, including those running the Android 1.6 platform. This means that when the final Android 1.6 platform is released, you will need to change your application's <code>android:minSdkVersion</code> manifest attribute to reference the API Level of "4", rather than "Donut", if your application is using Android 1.6 APIs. You would then need to recompile your application before publishing it. </p>
-
-<p>The use of a provisional API Level in this SDK is designed to protect developers and device users from inadvertently publishing or installing applications based on the Early Look framework API, which may not run properly on actual devices running Android 1.6.</p>
-
-<p>To develop using the Early Look framework API, you must reference an API Level of "Donut" in your application's manifest. </p>
-
-<p>Specifically, you must define a <code>android:minSdkVersion</code>
-attribute in a <code>&lt;uses-sdk&gt;</code> element as a child of
-<code>&lt;manifest&gt;</code> in the manifest file. When set, the
-attribute looks like this: </p>
-
-<pre>&lt;manifest&gt;
-  ...
-  &lt;uses-sdk android:minSdkVersion="Donut" /&gt;
-  ...
-&lt;/manifest&gt;</pre>
-
-<p>If you are developing in Eclipse with ADT, please read the next section for information about the ADT upgrade that supports the Early Look SDK's provisional API Level. </p>
-
-
-<h3>ADT Plugin for Eclipse</h3>
-
-<p>An updated version of the ADT Plugin for Eclipse is available in connection with the Android 1.6 Early Look SDK. The new version, ADT 0.9.2, provides support for the provisional API Level "Donut" that is offered in the Early Look SDK and includes several new features and improvements. These changes mean that this Early Look SDK does not work with older Eclipse plugins (ADT 0.9.1).</li>
-
-<p>If you are developing in Eclipse with ADT and want to get started with Android 1.6 Early Look SDK, you <em>must</em> download and install the correct version of the ADT Plugin (0.9.2 or higher). </p>
-
-<p>The new version of ADT is downloadable from the usual remote update site or is separately downloadable as a .zip archive. For instructions on how to download the plugin, please see <a href="upgrading.html#UpdateAdt">Upgrading Your Eclipse Plugin</a>. </p>
-
-<h3>Android AVD Manager</h3>
-
-<p>The SDK offers a new tool called Android AVD Manager that lets you manage your AVDs more efficiently. For example, you can quickly create new AVDs, manage their properties, and run a target AVD from a single window. 
-
-If you are developing in Eclipse with ADT, you can access the Android AVD Manager from the <strong>Window</strong> menu. </p>
-
-If you are developing in another IDE, you can access the AVD manager capabilities through the <code>android</code> command-line tool, located in the &lt;sdk&gt;/tools directory. You can launch the tool with a graphical UI by using the <code>android</code> command without specifying any options. The command-line version of the tool is also still available.</p>
-
-<h3>SDK Component Updater</h3>
-
-<p>This SDK includes a new SDK Component Updater tool that lets you download updated versions of SDK components individually into your environment, as soon as they become available. </p>
-
-<p>The Updater provides a graphical UI that lets you quickly check what Android platforms, add-ons, extras, and documentation packages are available in your SDK environment, what their versions are, and whether updated versions are available. Using the Updater, you can download one or more items from the remote repository and install them directly in your SDK environment. For example, the updater lets you receive updates to SDK tools incrementally, as they are made available, without having to wait for the next SDK release. </p>
-
-<p>To access the Updater, use the <code>android</code> command-line tool, located in the &lt;sdk&gt;/tools directory. You can launch the Updater by using the <code>android</code> command without specifying any options. </p>
-
-<p>In ADT, it you can also access the Updater through the Android AVD Manager tool. </p>
-
-<h3>Support for Test Packages in New Project Wizard</h3>
-
-<p>The New Project Wizard available in the ADT 0.9.2 now lets you add a test package containing JUnit or other classes of tests while you are creating or importing a new Android application project. </p>
-
-
-<h3>Other Notes and Resolved Issues</h3>
-
-<ul>
-<li>This SDK release adds support for Eclipse 3.5 (Galileo) and no longer formally supports Eclipse 3.3 (Europa). </li>
-<li>The issue preventing adb from recognizing Samsung Galaxy devices (linux SDK only) has been fixed.</li>
-</ul>
-
-<h2>SDK Contents</h2>
-
-<h4>Development tools</h4>
-
-<p>The SDK includes a full set of tools for developing and debugging application code and designing an application UI. You can read about the tools in the  
-<a href="{@docRoot}guide/developing/tools/index.html">Dev Guide</a> and access them in the <code>&lt;sdk&gt;/tools/</code> directory. 
-
-<p>The tools package in this SDK includes updates from those provided in the previous SDK. The tools use the same project structure as in the previous SDK (Android 1.5), but have been updated to support the the provisional API Level identifier "donut". If you have application projects developed in the Android 1.5 SDK, you can migrate them to the latest SDK without modification. For more information about how to migrate, see <a href="upgrading.html">Upgrading the SDK</a>.
-
-<p>For more information about the new tools features, see the <a href="#overview">SDK Overview</a> section above. 
-
-<h4 id="system_images">Android Platforms</h4>
-
-<p>This SDK includes multiple Android platform versions that you can use to develop applications. For each version, both a fully compliant Android library and system image are provided. The table below lists the platform versions included in this SDK. For more information about a platform version &mdash; features, applications included, localizations, API changes, and so on &mdash; see its Version Notes. </p>
-
-<table style="margin-right:1em;" width="80%">
-<tr>
-<th><nobr>Platform</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
-</tr>
-<tr>
-<td width="5%"><nobr>Android 1.6 Early Look (Android Donut)</nobr></td>
-<td  width="5%">Donut</td>
-<td  width="5%"></td>
-<td>Includes an Early Look Android 1.6 library and system image with a set of development applications. Does not include any external libraries (such as the Maps external library).</td>
-</tr>
-<tr>
-<td width="5%"><nobr>Android 1.5</nobr></td>
-<td  width="5%">3</td>
-<td  width="5%"><nobr><a href="{@docRoot}sdk/android-1.5.html">Version Notes</a></nobr></td>
-<td>Includes a standard Android 1.5 library and system image with a set of development applications. Does not include any external libraries (such as the Maps external library).</td>
-</tr>
-</table>
-
-<h4 id="system_images">SDK Add-Ons</h4>
-
-<p>An SDK add-on provides a development environment for an Android external library or a customized (but fully compliant) Android system image. This SDK includes the SDK add-on listed below. The Android system API Level required by the add-on is noted.</p>
-
-<table style="margin-right:1em;" width="80%">
-<tr>
-<th><nobr>Add-On</nobr></th><th><nobr>API Level</nobr></th><th>Notes</th><th>Description</th>
-</tr>
-<tr>
-<td width="5%"><nobr>Google APIs</nobr></td>
-<td  width="5%">Donut</td>
-<td  width="5%">&nbsp;</td>
-<td>Includes the com.google.android.maps external library, an Early Look 
-Android 1.6 system image, a {@link android.location.Geocoder Geocoder}
-backend service implementation, documentation, and sample code. </td>
-</tr>
-<tr>
-<td width="5%"><nobr>Google APIs</nobr></td>
-<td  width="5%">3</td>
-<td  width="5%">&nbsp;</td>
-<td>Includes the com.google.android.maps external library, a compliant 
-system image, a {@link android.location.Geocoder Geocoder}
-backend service implementation, documentation, and sample code. </td>
-</tr>
-</table>
-
-<h4>Sample Code and Applications</h4>
-
-<p>You can look at a variety of tutorials and samples in the <a href="{@docRoot}guide/samples/index.html">Dev Guide</a> and access the sample code itself
-in the <code>&lt;sdk&gt;/platforms/&lt;platform&gt;/samples/</code> directory of the SDK package. Note the new location &mdash; the SDK now includes multiple platform versions that you can develop against and each has its own sample code directory. </p>
-
-<p>For example, to view or build the samples available for the Android 
-1.6 Early Look platform (AVD target "Android Donut"), you will find the samples in the <code>&lt;sdk&gt;/platforms/android-Donut/samples/</code> directory of the SDK package. </p>
-
-<h4>Documentation</h4>
-
-<p>The SDK package includes a full set of local documentation. To view it, open the <code>&lt;sdk&gt;/documentation.html</code> file in a web browser. If you are developing in an IDE such as Eclipse, you can also view the reference documentation directly in the IDE. </p>
-
-
-<hr/>
-
-<div class="special">
-<p>Feedback on this preview SDK is welcome on the public Android Open Source forums:</p>
-<p style="margin-left:2em;"><a href="http://source.android.com/discuss">http://source.android.com/discuss</a></p>
-</div>
-
-
diff --git a/docs/html/sdk/preview/installing.jd b/docs/html/sdk/preview/installing.jd
index 05e7ab5e2a70..1e6b26b9077a 100644
--- a/docs/html/sdk/preview/installing.jd
+++ b/docs/html/sdk/preview/installing.jd
@@ -1,346 +1,5 @@
-page.title=Installing the Android SDK
-sdk.version=1.6
-sdk.preview=true
-sdk.date=August 2009
+sdk.redirect=true
 
 @jd:body
 
 
-<div id="qv-wrapper">
-<div id="qv">
-
-  <h2>In this document</h2>
-  <ol>
-    <li><a href="#Preparing">Preparing for Installation</a></li>
-    <li><a href="#Installing">Installing the SDK</a></li>
-    <li><a href="#InstallingADT">Installing the ADT Plugin for Eclipse</a>
-      <ol>
-        <li><a href="#Troubleshooting">Troubleshooting ADT Installation</a></li>
-      </ol>
-    </li>
-    <li><a href="#NextSteps">Next Steps</a></li>
-    <li><a href="#InstallationNotes">Installation Notes</a></li>
-  </ol>
-
-</div>
-</div>
-
-<p>This page describes how to install the Android Early Look SDK and set up your
-development environment.</p>
-
-<p>If you encounter any problems during installation, see the 
-<a href="#InstallationNotes">Installation Notes</a> at the bottom of
-this page.</p>
-
-<h4 style="margin-top">Upgrading?</h4>
-<p>If you have already developed applications using an earlier version
-of the Android SDK, please read <a href="upgrading.html">Upgrading the SDK</a>, instead.
-</p>
-
-
-<h2 id="Preparing">Preparing for Installation</h2>
-
-<p>Before you begin, take a moment to confirm that your development machine meets the 
-<a href="requirements.html">System Requirements</a>.
-</p>
-
-<p>If you will be developing on Eclipse with the Android Development
-Tools (ADT) Plugin &mdash; the recommended path if you are new to
-Android &mdash; make sure that you have a suitable version of Eclipse
-installed on your computer (3.4 or newer is recommended). If you need to install Eclipse, you can
-download it from this location: </p>
-
-<p style="margin-left:2em;"><a href=
-"http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a
-></p>
-
-<p>A Java or RCP version of Eclipse is recommended. </p>
-
-<h2 id="Installing">Installing the SDK</h2>
-
-<p>Unpack the Android SDK .zip archive to a suitable location on your machine. 
-By default, the SDK files are unpacked into a directory named 
-<code>android_sdk_<em>&lt;platform</em>&gt;_<em>&lt;release&gt;</em></code>. 
-The directory contains a local copy of the documentation (accessible by opening
-<code>documentation.html</code> in your browser) and the subdirectories 
-<code>tools/</code>, <code>add-ons/</code>, <code>platforms/</code>, and others. Inside
-each subdirectory of <code>platforms/</code> you'll find <code>samples/</code>, which includes
-code samples that are specific to each version of the platform.</p>
-
-<p>Make a note of the name and location of the unpacked SDK directory on your system &mdash; you 
-will need to refer to the SDK directory later, when setting up the Android plugin or when 
-using the SDK tools.</p>
-
-<p>Optionally, you may want to add the location of the SDK's primary <code>tools</code> directory 
-to your system <code>PATH</code>. The primary <code>tools/</code> directory is located at the root of the 
-SDK folder. Adding <code>tools</code> to your path lets you run Android Debug Bridge (adb) and 
-the other command line <a href="{@docRoot}guide/developing/tools/index.html">tools</a> without 
-needing to supply the full path to the tools directory. </p>
-<ul>
-    <li>On Linux, edit your <code>~/.bash_profile</code> or <code>~/.bashrc</code> file. Look
-    for a line that sets the PATH environment variable and add the
-    full path to the <code>tools/</code> directory to it. If you don't 
-    see a line setting the path, you can add one:</li>
-
-    <ul><code>export PATH=${PATH}:<em>&lt;your_sdk_dir&gt;</em>/tools</code></ul>
-
-    <li>On a Mac, look in your home directory for <code>.bash_profile</code> and
-    proceed as for Linux. You can create the <code>.bash_profile</code> if 
-    you haven't already set one up on your machine. </li>
-
-    <li>On Windows, right-click on My Computer, and select Properties.  
-  Under the Advanced tab, hit the Environment Variables button, and in the
-  dialog that comes up, double-click on Path (under System Variables). Add the full path to the 
-  <code>tools/</code> directory to the path. </li>
-  </ul>
-
-<p>Note that, if you update your SDK in the future, you 
-should remember to update your <code>PATH</code> settings to point to the new location, if different.</p>
-
-<p>If you will be using the Eclipse IDE as your development environment,
-the next section describes how to install the Android Development Tools (ADT) plugin and set up Eclipse. 
-If you choose not to use Eclipse, you can 
-develop Android applications in an IDE of your choice and then compile, debug and deploy using
-the tools included in the SDK (skip to <a href="#NextSteps">Next Steps</a>).</p>
-
-
-<h2 id="InstallingADT">Installing the ADT Plugin for Eclipse</h2>
-
-<p>Android offers a custom plugin for the Eclipse IDE, called Android
-Development Tools (ADT), that is designed to give you a powerful,
-integrated environment in which to build Android applications. It
-extends the capabilites of Eclipse to let you quickly set up new Android
-projects, create an application UI, add components based on the Android
-Framework API, debug your applications using the Android SDK tools, and even export
-signed (or unsigned) APKs in order to distribute your application.</p>
-
-<p>In general, using Eclipse with ADT is a highly recommended
-approach to Android development and is the fastest way to get started.
-(If you prefer to work in an IDE other than Eclipse,
-you do not need to install Eclipse or ADT, instead, you can directly
-use the SDK tools to build and debug your application&mdash;skip to <a href="#NextSteps">Next Steps</a>.)</p>
-
-<p>Once you have Eclipse installed, as described in <a href="#Preparing">Preparing for 
-Installation</a>, follow the steps below to
-download the ADT plugin and install it in your respective Eclipse
-environment. </p>
-
-<table style="font-size:100%">
-<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
-<tr>
-<td width="45%">
-<!-- 3.3 steps -->
-<ol>
-    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates</strong> 
-&gt; <strong>Find and Install...</strong>. </li>
-    <li>In the dialog that appears, select <strong>Search for new features to install</strong> 
-and click <strong>Next</strong>. </li>
-    <li>Click <strong>New Remote Site</strong>. </li>
-    <li>In the resulting dialog box, enter a name for the remote site (e.g. "Android Plugin") and 
-    enter the URL:
-        <pre>https://dl-ssl.google.com/android/eclipse/</pre>
-        <p>If you have trouble aqcuiring the plugin, try using "http" in the URL,
-        instead of "https" (https is preferred for security reasons).</p>
-        <p>Click <strong>OK</strong>.</p> </li>
-    <li>You should now see the new site added to the search list (and checked).
-        Click <strong>Finish</strong>. </li>
-    <li>In the subsequent Search Results dialog box, select the checkbox for the
-    "Android Plugin".
-    This will select the nested tools: "Android DDMS" and "Android Development Tools". 
-    Click <strong>Next</strong>.</li>
-    <li>Read and accept the license agreement, then click <strong>Next</strong>. </li>
-    <li>On the following Installation window, click <strong>Finish</strong>. </li>
-    <li>The ADT plugin is not digitally signed. Accept the installation anyway
-        by clicking <strong>Install All</strong>. </li>
-    <li>Restart Eclipse. </li>
-</ol>
-
-</td>
-<td>
-
-<!-- 3.4 steps -->
-<ol>
-    <li>Start Eclipse, then select <strong>Help</strong> &gt; <strong>Software Updates...</strong>.</li>
-    <li>In the dialog that appears, click the <strong>Available Software</strong> tab. </li>
-    <li>Click <strong>Add Site...</strong> </li>
-    <li>Enter the Location:
-      <pre>https://dl-ssl.google.com/android/eclipse/</pre>
-        <p>If you have trouble aqcuiring the plugin, try using "http" in the Location URL,
-        instead of "https" (https is preferred for security reasons).</p>   
-      <p>Click <strong>OK</strong>.</p></li>
-    <li>Back in the Available Software view, you should see the plugin listed by the URL,
-    with "Developer Tools" nested within it. Select the checkbox next to 
-      Developer Tools and click <strong>Install...</strong></li>
-    <li>On the subsequent Install window, "Android DDMS" and "Android Development Tools"
-    should both be checked. Click <strong>Next</strong>. </li>
-    <li>Read and accept the license agreement, then click <strong>Finish</strong>.</li>
-    <li>Restart Eclipse. </li>
-</ol>
-
-</td>
-</tr>
-</table>
-
-<p>Now modify your Eclipse preferences to point to the Android SDK directory:</p>
-<ol>
-    <li>Select <strong>Window</strong> &gt; <strong>Preferences...</strong> to open the Preferences
-        panel (Mac: <strong>Eclipse</strong> &gt; <strong>Preferences</strong>).</li>
-    <li>Select <strong>Android</strong> from the left panel. </li>
-    <li>For the <em>SDK Location</em> in the main panel, click <strong>Browse...</strong> and 
-locate your downloaded SDK directory. </li>
-    <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
-</ol>
-
-<p>Done! If you haven't encountered any problems, then you're ready to
-begin developing Android applications. See the 
-<a href="#NextSteps">Next Steps</a> section for suggestions on how to start. </p>
-
-
-<h3 id="Troubleshooting">Troubleshooting ADT Installation</h3>
-<p> 
-If you are having trouble downloading the ADT plugin after following the steps above, here are 
-some suggestions: </p>
-
-<ul>
-  <li>If Eclipse can not find the remote update site containing the ADT plugin, try changing 
-  the remote site URL to use http, rather than https. That is, set the Location for the remote site to:
-  <pre>http://dl-ssl.google.com/android/eclipse/</pre></li>
-  <li>If you are behind a firewall (such as a corporate firewall), make
-  sure that you have properly configured your proxy settings in Eclipse.
-  In Eclipse 3.3/3.4, you can configure proxy information from the main
-  Eclipse menu in <strong>Window</strong> (on Mac, <strong>Eclipse</strong>) &gt; 
-  <strong>Preferences</strong> &gt; <strong>General</strong> &gt; 
-  <strong>Network Connections</strong>.</li>
-</ul>
-<p> 
-If you are still unable to use Eclipse to download the ADT plugin as a remote update site, you 
-can download the ADT zip file to your local machine and manually install the it:
-</p>
-<ol>
-  <li><a href="http://developer.android.com/sdk/preview/index.html">Download the ADT Plugin zip file</a> (do not unpack it).</li>
-  <li>Follow steps 1 and 2 in the default install instructions (above).</li>
-  <li>In Eclipse 3.3, click <strong>New Archive Site...</strong>. <br/>
-      In Eclipse 3.4, click <strong>Add Site...</strong>, then <strong>Archive...</strong></li>
-  <li>Browse and select the downloaded zip file.</li>
-  <li>Follow the remaining procedures, above, starting from steps 5.</li>
-</ol>
-<p>To update your plugin once you've installed using the zip file, you will have to 
-follow these steps again instead of the default update instructions.</p>
-
-<h4>Other install errors</h4>
-
-<p>Note that there are features of ADT that require some optional 
-Eclipse components (for example, WST). If you encounter an error when 
-installing ADT, your Eclipse installion might not include these components. 
-For information about how to quickly add the necessary components to your 
-Eclipse installation, see the troubleshooting topic 
-<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT 
-Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>
-
-<h4>For Linux users</h4>
-<p>If you encounter this error when installing the ADT Plugin for Eclipse: 
-<pre>
-An error occurred during provisioning.
-Cannot connect to keystore.
-JKS</pre>
-<p>
-...then your development machine lacks a suitable Java VM. Installing Sun
-Java 6 will resolve this issue and you can then reinstall the ADT
-Plugin.</p>
-
-
-<h2 id="NextSteps">Next Steps</h2>
-<p>Once you have completed installation, you are ready to
-begin developing applications. Here are a few ways you can get started: </p>
-
-<p><strong>Learn about Android</strong></p>
-<ul>
-  <li>Take a look at the <a href="{@docRoot}guide/index.html">Dev
-  Guide</a> and the types of information it provides</li>
-  <li>Read an introduction to Android as a platform in <a
-  href="{@docRoot}guide/basics/what-is-android.html">What is
-  Android?</a></li>
-  <li>Learn about the Android framework and how applications run on it in
-  <a href="{@docRoot}guide/topics/fundamentals.html">Application
-  Fundamentals</a></li>
-  <li>Take a look at the Android framework API specification in the <a
-  href="{@docRoot}reference/packages.html">Reference</a> tab</li>
-</ul>
-
-<p><strong>Explore the SDK</strong></p>
-<ul>
-  <li>Get an overview of the <a
-  href="{@docRoot}guide/developing/tools/index.html">development
-  tools</a> that are available to you</li>
-  <li>Read how to develop <a
-  href="{@docRoot}guide/developing/eclipse-adt.html">in Eclipse/ADT</a> or
-  <a href="{@docRoot}guide/developing/other-ide.html">in other IDEs</a>
-  </li>
-</ul>
-
-<p><strong>Explore some code</strong></p>
-<ul>
-  <li>Set up a <a href="{@docRoot}guide/tutorials/hello-world.html">Hello
-  World application</a> (highly recommended, especially for Eclipse users)</li>
-  <li>Follow the <a href="{@docRoot}guide/tutorials/notepad/index.html">
-  Notepad Tutorial</a> to build a full Android application </li>
-  <li>Create a new project for one of the other sample applications
-  included in <code><em>&lt;sdk&gt;</em>/platforms/<em>&lt;platfrom&gt;</em>/samples</code>, 
-  then compile and run it in your development environment</li>
-</ul>
-
-<p><strong>Visit the Android developer groups</strong></p>
-<ul>
-  <li>Take a look at the <a
-  href="{@docRoot}community/index.html">Community</a> tab to see a list of
-  Android developers groups. In particular, you might want to look at the
-  <a href="http://groups.google.com/group/android-developers">Android
-  Developers</a> group to get a sense for what the Android developer
-  community is like.</li>
-</ul>
-
-
-<h2 id="InstallationNotes">Installation Notes</h2>
-
-<h3>Ubuntu Linux Notes</h3>
-
-<ul>
-  <li>If you need help installing and configuring Java on your
-    development machine, you might find these resources helpful: 
-    <ul>
-      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/Java </a></li>
-      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation</a></li>
-    </ul>
-  </li>
-  <li>Here are the steps to install Java and Eclipse, prior to installing
-  the Android SDK and ADT Plugin.
-    <ol>
-      <li>If you are running a 64-bit distribution on your development
-      machine, you need to install the <code>ia32-libs</code> package using
-      <code>apt-get:</code>:
-      <pre>apt-get install ia32-libs</pre>
-      </li>
-      <li>Next, install Java: <pre>apt-get install sun-java6-bin</pre></li>
-      <li>The Ubuntu package manager does not currently offer an Eclipse 3.3
-      version for download, so we recommend that you download Eclipse from
-      eclipse.org (<a
-      href="http://www.eclipse.org/downloads/">http://www.eclipse.org/
-      downloads/</a>). A Java or RCP version of Eclipse is recommended.</li>
-      <li>Follow the steps given in previous sections to install the SDK 
-      and the ADT plugin. </li>
-    </ol>
-  </li>
-</ul>
-
-<h3>Other Linux Notes</h3>
-
-<ul>
-  <li>If JDK is already installed on your development computer, please
-  take a moment to make sure that it meets the version requirements listed
-  in the <a href="{@docRoot}sdk/{@sdkCurrent}/requirements.html">System Requirements</a>.
-  In particular, note that some Linux distributions may include JDK 1.4 or Gnu
-  Compiler for Java, both of which are not supported for Android development.</li>
-</ul>
-
-
-
diff --git a/docs/html/sdk/preview/requirements.jd b/docs/html/sdk/preview/requirements.jd
index 15731e0a48e3..1e6b26b9077a 100644
--- a/docs/html/sdk/preview/requirements.jd
+++ b/docs/html/sdk/preview/requirements.jd
@@ -1,45 +1,5 @@
-page.title=System Requirements
-sdk.version=1.6
-sdk.preview=true
-@jd:body
-
-<p>The sections below describe the system and software requirements for developing 
-Android applications using the Android SDK tools included in Android 
-<?cs var:sdk.version ?> SDK<?cs if:sdk.rel.id ?>, Release <?cs var:sdk.rel.id ?><?cs /if ?>. </p>
+sdk.redirect=true
 
-<h3>Supported Operating Systems</h3>
-<ul>
-  <li>Windows XP (32-bit) or Vista (32- or 64-bit)</li>
-  <li>Mac OS X 10.4.8 or later (x86 only)</li>
-  <li>Linux (tested on Linux Ubuntu Dapper Drake)</li>
-</ul>
+@jd:body
 
-<h3>Supported Development Environments</h3>
-<ul>
-  <li>Eclipse IDE
-    <ul>
-      <li><a href="http://www.eclipse.org/downloads/">Eclipse</a> 3.3 (Europa), 3.4 (Ganymede), 3.5 (Galileo)
-        <ul>
-        <li><strong>Note:</strong> Eclipse 3.3 has not been fully tested with ADT 0.9.2 and support can no longer be guaranteed. We suggest you upgrade to 
-          Eclipse 3.4 or 3.5.</li>
-        <li>Recommended Eclipse IDE packages: Eclipse IDE for Java EE Developers, Eclipse IDE for Java Developers, Eclipse for RCP/Plug-in Developers</li>
-        <li>Eclipse <a href="http://www.eclipse.org/jdt">JDT</a> plugin (included in most Eclipse IDE packages) </li>
-        <li>Eclipse Classic IDE package is not supported.</li>
-        </ul>
-      </li>     
-      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
-      <li><a href="installing.html#installingplugin">Android Development Tools plugin</a> (optional)</li>
-      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
-    </ul>
-  </li>
-  <li>Other development environments or IDEs
-    <ul>
-      <li><a href="http://java.sun.com/javase/downloads/index.jsp">JDK 5 or JDK 6</a> (JRE alone is not sufficient)</li>
-      <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for Linux and Mac, 1.7 or later for Windows</li>
-      <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
-    </ul>
-  </li>
-</ul>
 
-<p class="note"><strong>Note:</strong> If JDK is already installed on your development computer, please take a moment to make sure that it meets the version requirements listed above. In
-particular, note that some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are not supported for Android development. </p>
\ No newline at end of file
diff --git a/docs/html/sdk/preview/upgrading.jd b/docs/html/sdk/preview/upgrading.jd
index da2eb251f6a9..1e6b26b9077a 100644
--- a/docs/html/sdk/preview/upgrading.jd
+++ b/docs/html/sdk/preview/upgrading.jd
@@ -1,258 +1,5 @@
-page.title=Upgrading the SDK
-sdk.version=1.6
-sdk.preview=true
-@jd:body
-
-
-<div id="qv-wrapper">
-<div id="qv">
-
-  <h2>Upgrading the SDK</h2>
-  <ul>
-    <li>ADT 0.9 / 0.9.1 is not compatible with the Android 1.6 Early Look SDK. You must upgrade
-    ADT to 0.9.2.</li>
-    <li>The Early Look SDK uses a special provisional API Level, "Donut", which is required
-    to compile against the new Donut platform.</li>
-  </ul>
-
-  <h2>In this document</h2>
-  <ol>
-    <li><a href="#Install">Install the SDK</a></li>
-    <li><a href="#UpdateAdt">Update Your Eclipse ADT Plugin</a></li>
-    <li><a href="#RunYourApps">Run Your Applications</a></li>
-    <li><a href="#ConvertYourApps">Convert Your Applications</a></li>
-  </ol>
-  
-  <h2>Migrating references</h2>
-  <ol>
-    <li><a href="{@docRoot}sdk/api_diff/4/changes.html">Android 1.6 Early Look API Differences</a></li>
-  </ol>
-
-</div>
-</div>
-
-<p>This document describes how to move your development environment and existing
-Android applications from an Android 1.5 SDK to the Android 1.6 Early Look SDK.
-If you are migrating applications from an SDK older than 1.5, please also read the upgrading
-document available in the Android 1.5 SDK package.</p>
-
-<p>There are several compelling reasons to upgrade, such as new SDK tools
-that make developing more efficient and new APIs that allow you to expand the feature-set
-of your applications. However, even if you or your applications don't require these enhancements,
-it's important that you upgrade to ensure that your applications run properly on the upcoming
-Android platform.</p>
-
-<p>The Android 1.6 platform will soon be deployable to devices around the world.
-If you have already released Android applications to the public, you should
-test the forward-compatibility of your applications on the latest version of the platform
-as soon as possible. It's unlikely that you'll encounter breakage in your applications, but
-in the interest of maintaining the best user experience, you should take no risks.
-So, please install the new Android SDK and test your applications on the new platform.</p>
-
-<!-- NOT AVAILABLE FOR THE PREVIEW
-<p>For more information on new SDK features and system changes, 
-see the <a href="{@docRoot}sdk/android-1.5.html">Android 1.5 Version Notes</a>.</p>
--->
-
-<h2 id="Install">Install the SDK</h2>
-
-<!--
-<p>If you haven't yet downloaded the SDK, <a href="index.html">download from here</a> 
-and unpack it into a safe location.</p>
--->
-<p>Now that you have the Android 1.6 Early Look SDK,
-you need to perform some of the regular installation steps.</p>
-
-
-<p>If you had previously setup your <code>PATH</code> variable to point to the SDK tools directory, 
-then you need to update it to point to the new SDK. For example, for a 
-<code>.bashrc</code> or <code>.bash_profile</code> file:</p>
-<pre>export PATH=$PATH:<em>&lt;your_sdk_dir></em>/tools</pre>
-
-
-<h2 id="UpdateAdt">Update Your Eclipse ADT Plugin</h2>
-
-<p>If you don't use Eclipse for development,
-skip to <a href="#RunYourApps">Run Your Applications</a>.</p>
-
-<!--
-<p><em>If you installed ADT 0.9.2 with the Android 1.6 Early Look SDK, there have been
-additional changes, so please continue with this guide and update ADT.</em></p>
--->
-
-<p>A new ADT plugin (version 0.9.2) is required for the Android 1.6 Early Look SDK.
-With ADT 0.9.2, you can still compile your applications against 
-multiple platform versions, such as Android 1.5. However, previous versions
-of ADT will not work with the Android 1.6 Early Look SDK, so you must upgrade
-to ADT 0.9.2.</p>
-
-<p>If you're currently using a version of ADT <em>older</em> than version 0.9, then you must
-uninstall ADT before you proceed (read how to
-<a href="http://developer.android.com/sdk/1.5_r3/upgrading.html#uninstallAdt">Uninstall
-your previous ADT plugin</a>). If you currently have version 0.9 or 0.9.1, then you don't 
-need to uninstall and can continue with the procedure below.</p>
-
-<h3 id="installAdt">Install the 0.9.2 ADT plugin</h3>
-
-<p>To install the new ADT plugin, follow the steps below for your respective version of Eclipse.</p>
-
-<table style="font-size:100%">
-<tr><th>Eclipse 3.3 (Europa)</th><th>Eclipse 3.4 (Ganymede)</th></tr>
-<tr>
-<td width="50%">
-<!-- 3.3 steps -->
-<ol>
-    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong> &gt; 
-      <strong>Find and Install</strong>. </li>
-    <li>Select <strong>Search for new features to install</strong>.</li>
-    <li>Select the Android plugin entry by checking the box next to it, 
-      then click <strong>Finish</strong>.
-      <p>(Your original entry for the plugin should still be here. If not, see the guide
-      to <a href="installing.html#installingplugin">Installing the ADT Plugin</a>.)
-      </p></li>
-    <li>In the results, expand the entry for the Android plugin and
-      be sure that "Developer Tools" is checked, then click <strong>Next</strong>.
-      (This will install "Android DDMS" and "Android Development Tools".)</li>
-    <li>Read and accept the license agreement, then click <strong>Next</strong>.
-    <li>In the next window, click <strong>Finish</strong> to start installation.</li>
-    <li>The ADT plugin is not digitally signed. Accept the installation anyway by clicking 
-    <strong>Install All</strong>.</li>
-    <li>Restart Eclipse.</li>
-</ol>
-</td>
-<td>
-<!-- 3.4 steps -->
-<ol>
-    <li>Select <strong>Help</strong> &gt; <strong>Software Updates</strong>.</li>
-    <li>Select the <strong>Available Software</strong> tab.</li>
-    <li>Expand the entry for the Andriod plugin (may be listed as the location URL)
-      and select "Developer Tools" by checking the box next to it, then click 
-      <strong>Install</strong>.</li>
-    <li>On the next window, "Android DDMS" and "Android Development Tools" 
-    should both be checked. Click <strong>Finish</strong>.</li>
-    <li>Restart Eclipse.</li>
-</ol>
-</td>
-</tr>
-</table>
-
-<p>If you encounter problems with this update procedure, try performing a fresh installation. 
-Ensure your current ADT is fully uninstalled and then
-follow the guide to <a href="installing.html#InstallingADT">Installing the ADT Plugin
-for Eclipse</a>.</p>
-
-<h3 id="updateEclipsePrefs">Update your Eclipse SDK Preferences</h3>
-
-<p>The last step is to update your Eclipse preferences to point to the new SDK directory:</p>
-<ol>
-  <li>Select <strong>Window</strong> > <strong>Preferences</strong> to open the Preferences 
-  panel (Mac: <strong>Eclipse</strong> > <strong>Preferences</strong>).</li>
-  <li>Select <strong>Android</strong> from the left panel.</li>
-  <li>For the SDK Location, click <strong>Browse</strong> 
-  and locate your SDK directory.</li>
-  <li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
-</ol>
-
-
-<h2 id="RunYourApps">Run Your Applications</h2>
-
-<p>Now that you have installed the Android 1.6 Early Look SDK, we encourage you
-to run each of your applications in an instance
-of the emulator that's running the new Android 1.6 system image. It's possible (however, unlikely) 
-that you'll encounter unexpected behavior in your application when you run your applications on
-the new system image. Whether you believe your application will be affected by 
-platform changes or not, it's very important that you test the application's 
-forward-compatibility.</p>
-
-<p>To test forward-compatibility, simply run your application, as-is, on an instance of the Android
-Emulator that uses an AVD targeted to "Android Donut (Preview)":</p>
-
-<ol>
-  <li>Make no changes to your application code.</li>
-  <li>Create a new AVD that's targeted to the "Donut" platform.</li>
-  <li>Launch your application in an emulator running the new AVD.</li>
-  <li>Perform normal testing on your application to ensure everything works as expected.</li>
-</ol>
-
-<p>For more information on creating an AVD and launching your application refer to the 
-<a href="{@docRoot}guide/developing/eclipse-adt.html#Running">Eclipse guide to 
-Running Your Application</a> or the 
-<a href="{@docRoot}guide/developing/other-ide.html#Running">Ant guide to 
-Running Your Application</a>, depending on your development environment.</p>
-
-
-<h2 id="ConvertYourApps">Convert Your Applications</h2>
-
-<p>If you want to fully utilize new APIs introduced with the Android 1.6 Early Look SDK,
-then you'll need to convert your application to compile against the new "Donut" platform.</p>
-
-<p>First, you need to change the value of the <code>minSdkVersion</code> attribute in
-the <code>&lt;uses-sdk></code> manifest element. While
-running your application against the Donut platform included with the Early Look SDK, you
-<strong>must</strong> set the <code>minSdkVersion</code> value to "Donut". For example:</p>
-
-<pre>
-&lt;manifest>
-  ...
-  &lt;uses-sdk android:minSdkVersion="Donut" />
-  ...
-&lt;/manifest>
-</pre>
-
-<p>This value is required only while compiling against the Donut platform included with
-the Android 1.6 Early Look SDK. Once the final SDK is made
-available for Android 1.6, you will need to change this value.
-For more information, read about the <a href="index.html#provisional">Framework API and
-Provisional API Level</a>.</p>
-
-<p>Once you've changed the <code>minSdkVersion</code> value in your application's manifest, 
-continue with the procedures below to convert your applications.</p>
-
-<h3 id="EclipseUsers">Eclipse users</h3>
-
-<ol>
-	<li>Right-click on the individual project (in the Package Explorer)
-	   and select <strong>Properties</strong>.</li>
-	<li>In the properties, open the Android panel and select a new Project Build Target.
-	    Select "Android Donut (Preview)" to target the new
-	    platform (or "Google APIs" with the "Donut" platform if your application uses the Maps APIs).</li>
-	<li>Click <strong>Apply</strong>, then <strong>OK</strong>.</li>
-</ol>
-	
-	<p>Remember that you must create an AVD that targets the same platform in order to run the emulator.
-  Continue with the
-	<a href="{@docRoot}guide/developing/eclipse-adt.html#Running">Eclipse guide to
-	Running Your Application</a>. During the procedure to Running Your Application, select a "deployment
-  target" or the AVD that includes the "Donut" platform. If your application utilizes the Google Maps APIs (i.e.,
-	MapView), be certain to select a target that includes the Google APIs.</p>
-	
-	
-<h3 id="AntUsers">Ant users</h3>
-	
-	<p>Use the <code>android</code> tool (located in <code><em>your_sdk</em>/tools/</code>)
-	to create a new <code>build.xml</code> that references
-	the new platform target. To see a list of available targets, execute:</p>
-	
-	<pre>android list targets</pre>
-	
-	<p>Select the target <code>id</code> that corresponds to the "Donut" platform and pass it with the
-	<code>--target</code> parameter when updating your project. For example:</p>
-	
-	<pre>android update project --path /path/to/my-project --target 2</pre>
-
-<p>Remember that you must create an Android Virtual Device (AVD) that's targeted to the
-	same platform before you can run the updated application an instance
-	of the emulator. Please continue with the
-	<a href="{@docRoot}guide/developing/other-ide.html#Running">Ant guide to
-	Running Your Application</a>. During the procedure to Running Your Application, select a "deployment
-  target" for the AVD that includes the "Donut" platform.
-	If your application utilizes the Google Maps APIs (i.e.,
-	MapView), be certain to select a target that includes the Google APIs.</p>
+sdk.redirect=true
 
+@jd:body
 
-<div class="special">
-<p>If you have additional trouble updating your code, visit the 
-<a href="http://groups.google.com/group/android-developers">Android Developers Group</a>
-to seek help from other Android developers.</p>
-</div>
 
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index c08d75e46e66..64af012446dd 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -74,6 +74,7 @@
         <span class="zh-TW">系統影像版本資訊</span>
     </h2>
     <ul>
+      <li><a href="<?cs var:toroot ?>sdk/android-1.6.html">Android 1.6 Version Notes</a></li>
       <li><a href="<?cs var:toroot ?>sdk/android-1.5.html">Android 1.5 Version Notes</a></li>
       <li><a href="<?cs var:toroot ?>sdk/android-1.1.html">Android 1.1 Version Notes</a></li>
     </ul>
@@ -96,6 +97,7 @@
         <span class="zh-TW">較舊的 SDK 發行版本</span>
     </h2>
     <ul>
+      <li><a href="<?cs var:toroot ?>sdk/1.5_r3/index.html">Android 1.5 SDK, r3</a></li>
       <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Android 1.1 SDK, r1</a></li>
       <li><a href="<?cs var:toroot ?>sdk/1.0_r2/index.html">Android 1.0 SDK, r2</a></li>
       <li><a href="<?cs var:toroot ?>sdk/older_releases.html">Other Releases</a></li>
diff --git a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
index fdc12ce727b0..80904da5f0d7 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/activity/LifecycleTest.java
@@ -67,7 +67,8 @@ public class LifecycleTest extends ActivityTestsBase {
         runLaunchpad(LaunchpadActivity.LIFECYCLE_SCREEN);
     }
 
-    @LargeTest
+    //flaky test, removing from large suite until 1866891 is fixed
+    //@LargeTest
     public void testDialog() throws Exception {
         mIntent = mTopIntent;
         runLaunchpad(LaunchpadActivity.LIFECYCLE_DIALOG);