merge ics-mr0

Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d

6 files changed, 58 insertions, 12 deletions

diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index e08119f..9ce3649 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -30,14 +30,9 @@ device directly from Eclipse or from the command line with ADB. If
 you don't yet have a device, check with the service providers in your area to determine which
 Android-powered devices are available.</p>
 
-<p>If you want a SIM-unlocked phone, then you might consider either an Android Dev Phone or the
-Google Nexus S. These are SIM-unlocked so that you can use them on any GSM network using a SIM
-card. The Android Dev Phones also feature an unlocked bootloader so you can install custom system
-images (great for developing and installing custom versions of the Android platform). To find a
-a place you can purchase the Nexus S, visit <a
-href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>. To purchase an Android
-Dev Phone, see the <a href="http://market.android.com/publish">Android Market</a> site
-(requires a developer account).</p>
+<p>If you want a SIM-unlocked phone, then you might consider the Google Nexus S. To find a place
+to purchase the Nexus S and other Android-powered devices, visit <a
+href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>.</p>
 
 <p class="note"><strong>Note:</strong> When developing on a device, keep in mind that you should
 still use the <a
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd
index 02a8a8e..e23fb0ec 100644
--- a/docs/html/guide/topics/manifest/activity-element.jd
+++ b/docs/html/guide/topics/manifest/activity-element.jd
@@ -34,6 +34,7 @@ parent.link=manifest-intro.html
           android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
           android:<a href="#aff">taskAffinity</a>="<i>string</i>"
           android:<a href="#theme">theme</a>="<i>resource or theme</i>"
+          android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"]
           android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified",
                                        "stateUnchanged", "stateHidden",
                                        "stateAlwaysHidden", "stateVisible",
@@ -749,14 +750,39 @@ match what the activity actually looks like).
 
 <p>
 If this attribute is not set, the activity inherits the theme set for the 
-application as a whole &mdash; see the 
+application as a whole &mdash; from the 
 <code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code> 
 element's 
 <code><a href="{@docRoot}guide/topics/manifest/application-element.html#theme">theme</a></code> 
-attribute.  If that attribute is also not set, the default system theme is used.
+attribute.  If that attribute is also not set, the default system theme is used. For more
+information, see the <a
+href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer guide.
 </p>
 <dd>
 
+<!-- ##api level 14## -->
+<dt><a name="uioptions"></a>{@code android:uiOptions}</dt>
+<dd>Extra options for an activity's UI.
+  <p>Must be one of the following values.</p>
+
+  <table>
+    <tr><th>Value</th><th>Description</th></tr>
+    <tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr>
+    <tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at
+the bottom of the screen to display action items in the {@link android.app.ActionBar}, when
+constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small
+number of action items appearing in the action bar at the top of the screen, the action bar is
+split into the top navigation section and the bottom bar for action items. This ensures a reasonable
+amount of space is made available not only for the action items, but also for navigation and title
+elements at the top. Menu items are not split across the two bars; they always appear
+together.</td></tr>
+  </table>
+  <p>For more information about the action bar, see the <a
+href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p>
+  <p>This attribute was added in API level 14.</p>
+</dd>
+
+
 <!-- ##api level 3## -->
 <dt><a name="wsoft"></a>{@code android:windowSoftInputMode}</dt>
 <dd>How the main window of the activity interacts with the window containing 
diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd
index 41313ed..4f1964c 100644
--- a/docs/html/guide/topics/manifest/application-element.jd
+++ b/docs/html/guide/topics/manifest/application-element.jd
@@ -23,7 +23,8 @@ parent.link=manifest-intro.html
              android:<a href="#proc">process</a>="<i>string</i>"
              android:<a href="#restoreany">restoreAnyVersion</a>=["true" | "false"]
              android:<a href="#aff">taskAffinity</a>="<i>string</i>"
-             android:<a href="#theme">theme</a>="<i>resource or theme</i>" &gt;
+             android:<a href="#theme">theme</a>="<i>resource or theme</i>"
+             android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"] &gt;
     . . .
 &lt;/application&gt;</pre></dd>
 
@@ -276,7 +277,31 @@ set by the
 <dd>A reference to a style resource defining a default theme for all
 activities in the application.  Individual activities can override
 the default by setting their own <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#theme">theme</a></code> 
-attributes; see that attribute for more information.</dd>
+attributes. For more information, see the <a
+href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer guide.
+</dd>
+
+<!-- ##api level 14## -->
+<dt><a name="uioptions"></a>{@code android:uiOptions}</dt>
+<dd>Extra options for an activity's UI.
+  <p>Must be one of the following values.</p>
+
+  <table>
+    <tr><th>Value</th><th>Description</th></tr>
+    <tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr>
+    <tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at
+the bottom of the screen to display action items in the {@link android.app.ActionBar}, when
+constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small
+number of action items appearing in the action bar at the top of the screen, the action bar is
+split into the top navigation section and the bottom bar for action items. This ensures a reasonable
+amount of space is made available not only for the action items, but also for navigation and title
+elements at the top. Menu items are not split across the two bars; they always appear
+together.</td></tr>
+  </table>
+  <p>For more information about the action bar, see the <a
+href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p>
+  <p>This attribute was added in API level 14.</p>
+</dd>
 
 </dl></dd>
 
diff --git a/docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf b/docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf
new file mode 100644
index 0000000..598a27e
--- /dev/null
+++ b/docs/html/shareables/adl/2011Q3_Android_Market_for_Developers.pdf
diff --git a/docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf b/docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf
new file mode 100644
index 0000000..6ef41dd
--- /dev/null
+++ b/docs/html/shareables/adl/2011Q3_Designing_UIs_for_Phones_and_Tablets.pdf
diff --git a/docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf b/docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf
new file mode 100644
index 0000000..da954d8
--- /dev/null
+++ b/docs/html/shareables/adl/2011Q3_Introduction_to_Honeycomb_APIs.pdf