diff options
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/index.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/docs/html/guide/index.jd b/docs/html/guide/index.jd index d78a1b1..cb4f65c 100644 --- a/docs/html/guide/index.jd +++ b/docs/html/guide/index.jd @@ -30,7 +30,7 @@ screen for a user interface, and a <em>service</em> independently performs work in the background.</p> <p>From one component you can start another component using an <em>intent</em>. You can even start -a component in a different app, such an activity in a maps app to show an address. This model +a component in a different app, such as an activity in a maps app to show an address. This model provides multiple entry points for a single app and allows any app to behave as a user's "default" for an action that other apps may invoke.</p> diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index c1256f9..99e64d9 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -13,10 +13,11 @@ parent.link=manifest-intro.html android:<a href="#clear">clearTaskOnLaunch</a>=["true" | "false"] android:<a href="#config">configChanges</a>=["mcc", "mnc", "locale", "touchscreen", "keyboard", "keyboardHidden", - "navigation", "screenLayout", "fontScale", "uiMode", - "orientation", "screenSize", "smallestScreenSize"] - android:<a href="#dlmode">documentLaunchMode</a>=["intoExisting", "always", - "none", "never"] + "navigation", "screenLayout", "fontScale", + "uiMode", "orientation", "screenSize", + "smallestScreenSize"] + android:<a href="#dlmode">documentLaunchMode</a>=["intoExisting" | "always" | + "none" | "never"] android:<a href="#enabled">enabled</a>=["true" | "false"] android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"] android:<a href="#exported">exported</a>=["true" | "false"] |