diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-04-02 19:25:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 19:25:25 +0000 |
| commit | f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a (patch) | |
| tree | 4721e34df3b80c9c5815bf91c88716e0a7465d6c /docs/html/guide | |
| parent | 776cf41d7c8f239d20397886f2120407396cfc87 (diff) | |
| parent | d0609d1cb43c0353cd39f74cd48b104fb5b90a46 (diff) | |
| download | frameworks_base-f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a.zip frameworks_base-f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a.tar.gz frameworks_base-f2ff12ba00ba7c290bc15ea28fdcf3c6d6d1029a.tar.bz2 | |
Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
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"] |