diff options
| author | 2015-04-02 20:10:55 +0000 | |
|---|---|---|
| committer | 2015-04-02 20:10:55 +0000 | |
| commit | f99a16c943a4366bdfdba19534457f9e45538f7d (patch) | |
| tree | 8b2f3164971bff0f2f13f327d8fc5e94d9219b8f | |
| parent | e2fc3adbb4040400496aebdab80c4cac1083da27 (diff) | |
| parent | 589a272e97d1f24abee1bdfce18ab88cbd5f12a9 (diff) | |
am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '589a272e97d1f24abee1bdfce18ab88cbd5f12a9':
docs: Fixed formatting in android:documentLaunchMode syntax section
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index c1256f986619..99e64d95aa2f 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"] |