diff options
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 7 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/application-element.jd | 9 |
2 files changed, 4 insertions, 12 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index b26b7f1d9514..f31dfec94cdb 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -90,10 +90,9 @@ <attr name="manageSpaceActivity" format="string" /> <!-- Option to let applications specify that user data can/cannot be - cleared. Some applications might not want to clear user data. Such - applications can explicitly set this value to false. This flag is - turned on by default unless explicitly set to false - by applications. --> + cleared. This flag is turned on by default. + <em>This attribute is usable only by applications + included in the system image. Third-party apps cannot use it.</em> --> <attr name="allowClearUserData" format="boolean" /> <!-- Option to let applications specify that user data should diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd index 786223fcc4a9..9ac07fd884e5 100644 --- a/docs/html/guide/topics/manifest/application-element.jd +++ b/docs/html/guide/topics/manifest/application-element.jd @@ -3,8 +3,7 @@ page.title=<application> <dl class="xml"> <dt>syntax:</dt> -<dd><pre class="stx"><application android:<a href="#clear">allowClearUserData</a>=["true" | "false"] - android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"] +<dd><pre class="stx"><application android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"] android:<a href="#agent">backupAgent</a>="<i>string</i>" android:<a href="#debug">debuggable</a>=["true" | "false"] android:<a href="#desc">description</a>="<i>string resource</i>" @@ -49,12 +48,6 @@ cannot be overridden by the components.</dd> <dt>attributes</dt> <dd><dl class="attr"> -<dt><a name="clear"></a>{@code android:allowClearUserData}</dt> -<dd>Whether or not users are given the option to remove user data — -"{@code true}" if they are, and "{@code false}" if not. If the value is -"{@code true}", as it is by default, the application manager includes an -option that allows users to clear the data.</dd> - <dt><a name="reparent"></a>{@code android:allowTaskReparenting}</dt> <dd>Whether or not activities that the application defines can move from the task that started them to the task they have an affinity for when that task |