Skip to content

Commit 084369f

Browse files
committed
docs: add uiOptions attribute to manifest docs
Change-Id: Ibe2960b6a4ee4e2d4a47e4acc7c197d68702d1e6
1 parent cd3ec73 commit 084369f

File tree

2 files changed

+55
-4
lines changed

2 files changed

+55
-4
lines changed

docs/html/guide/topics/manifest/activity-element.jd

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ parent.link=manifest-intro.html
3434
android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
3535
android:<a href="#aff">taskAffinity</a>="<i>string</i>"
3636
android:<a href="#theme">theme</a>="<i>resource or theme</i>"
37+
android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"]
3738
android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified",
3839
"stateUnchanged", "stateHidden",
3940
"stateAlwaysHidden", "stateVisible",
@@ -749,14 +750,39 @@ match what the activity actually looks like).
749750

750751
<p>
751752
If this attribute is not set, the activity inherits the theme set for the
752-
application as a whole &mdash; see the
753+
application as a whole &mdash; from the
753754
<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>
754755
element's
755756
<code><a href="{@docRoot}guide/topics/manifest/application-element.html#theme">theme</a></code>
756-
attribute. If that attribute is also not set, the default system theme is used.
757+
attribute. If that attribute is also not set, the default system theme is used. For more
758+
information, see the <a
759+
href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer guide.
757760
</p>
758761
<dd>
759762

763+
<!-- ##api level 14## -->
764+
<dt><a name="uioptions"></a>{@code android:uiOptions}</dt>
765+
<dd>Extra options for an activity's UI.
766+
<p>Must be one of the following values.</p>
767+
768+
<table>
769+
<tr><th>Value</th><th>Description</th></tr>
770+
<tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr>
771+
<tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at
772+
the bottom of the screen to display action items in the {@link android.app.ActionBar}, when
773+
constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small
774+
number of action items appearing in the action bar at the top of the screen, the action bar is
775+
split into the top navigation section and the bottom bar for action items. This ensures a reasonable
776+
amount of space is made available not only for the action items, but also for navigation and title
777+
elements at the top. Menu items are not split across the two bars; they always appear
778+
together.</td></tr>
779+
</table>
780+
<p>For more information about the action bar, see the <a
781+
href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p>
782+
<p>This attribute was added in API level 14.</p>
783+
</dd>
784+
785+
760786
<!-- ##api level 3## -->
761787
<dt><a name="wsoft"></a>{@code android:windowSoftInputMode}</dt>
762788
<dd>How the main window of the activity interacts with the window containing

docs/html/guide/topics/manifest/application-element.jd

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ parent.link=manifest-intro.html
2323
android:<a href="#proc">process</a>="<i>string</i>"
2424
android:<a href="#restoreany">restoreAnyVersion</a>=["true" | "false"]
2525
android:<a href="#aff">taskAffinity</a>="<i>string</i>"
26-
android:<a href="#theme">theme</a>="<i>resource or theme</i>" &gt;
26+
android:<a href="#theme">theme</a>="<i>resource or theme</i>"
27+
android:<a href="#uioptions">uiOptions</a>=["none" | "splitActionBarWhenNarrow"] &gt;
2728
. . .
2829
&lt;/application&gt;</pre></dd>
2930

@@ -276,7 +277,31 @@ set by the
276277
<dd>A reference to a style resource defining a default theme for all
277278
activities in the application. Individual activities can override
278279
the default by setting their own <code><a href="{@docRoot}guide/topics/manifest/activity-element.html#theme">theme</a></code>
279-
attributes; see that attribute for more information.</dd>
280+
attributes. For more information, see the <a
281+
href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer guide.
282+
</dd>
283+
284+
<!-- ##api level 14## -->
285+
<dt><a name="uioptions"></a>{@code android:uiOptions}</dt>
286+
<dd>Extra options for an activity's UI.
287+
<p>Must be one of the following values.</p>
288+
289+
<table>
290+
<tr><th>Value</th><th>Description</th></tr>
291+
<tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr>
292+
<tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at
293+
the bottom of the screen to display action items in the {@link android.app.ActionBar}, when
294+
constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small
295+
number of action items appearing in the action bar at the top of the screen, the action bar is
296+
split into the top navigation section and the bottom bar for action items. This ensures a reasonable
297+
amount of space is made available not only for the action items, but also for navigation and title
298+
elements at the top. Menu items are not split across the two bars; they always appear
299+
together.</td></tr>
300+
</table>
301+
<p>For more information about the action bar, see the <a
302+
href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p>
303+
<p>This attribute was added in API level 14.</p>
304+
</dd>
280305

281306
</dl></dd>
282307

0 commit comments

Comments
 (0)