diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index bd1edc2bdb216..a8d7615fda1f5 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -5,7 +5,8 @@ parent.link=manifest-intro.html
syntax:
-
<activity android:allowTaskReparenting=["true" | "false"]
+
<activity android:allowEmbedded=["true" | "false"]
+          android:allowTaskReparenting=["true" | "false"]
           android:alwaysRetainTaskState=["true" | "false"]
           android:clearTaskOnLaunch=["true" | "false"]
           android:configChanges=["mcc", "mnc", "locale",
@@ -62,6 +63,17 @@ by the system and will never be run.
 
 
attributes:
+
{@code android:allowEmbedded}
+
+ Indicate that the activity can be launched as the embedded child of another + activity. Particularly in the case where the child lives in a container + such as a Display owned by another activity. For example, activities + that are used for Wear custom notifications must declare this so + Wear can display the activity in it's context stream, which resides + in another process. + +

The default value of this attribute is false. +

{@code android:allowTaskReparenting}
Whether or not the activity can move from the task that started it to the task it has an affinity for when that task is next brought to the