diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-04-02 20:38:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-02 20:38:20 +0000 |
| commit | 2cc841af910ce3a11c63c66e780c11af3c5be0a0 (patch) | |
| tree | 3399f975f090d202bbe99546c8cefd2c020933aa /docs/html/guide | |
| parent | a4dc29a72122f3e52377134039ebdb92b8e4d618 (diff) | |
| parent | 93b3d6658762a84b23cd3421d0f41e4d82693cc3 (diff) | |
| download | frameworks_base-2cc841af910ce3a11c63c66e780c11af3c5be0a0.zip frameworks_base-2cc841af910ce3a11c63c66e780c11af3c5be0a0.tar.gz frameworks_base-2cc841af910ce3a11c63c66e780c11af3c5be0a0.tar.bz2 | |
am 93b3d665: am 7818f205: am f99a16c9: am 589a272e: am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
* commit '93b3d6658762a84b23cd3421d0f41e4d82693cc3':
docs: Fixed formatting in android:documentLaunchMode syntax section
Diffstat (limited to 'docs/html/guide')
| -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 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"] |