summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/res/res/values/attrs_manifest.xml3
-rw-r--r--docs/html/guide/developing/tools/index.jd5
2 files changed, 7 insertions, 1 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 46a16fc..b26b7f1 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1429,7 +1429,8 @@
<code>screen</code> tag, a child of <code>compatible-screens</code>,
which is itseld a child of the root
{@link #AndroidManifest manifest} tag. -->
- <declare-styleable name="AndroidManifestCompatibleScreensScreen">
+ <declare-styleable name="AndroidManifestCompatibleScreensScreen"
+ parent="AndroidManifest.AndroidManifestCompatibleScreens">
<!-- Specifies a compatible screen size, as per the device
configuration screen size bins. -->
<attr name="screenSize">
diff --git a/docs/html/guide/developing/tools/index.jd b/docs/html/guide/developing/tools/index.jd
index 0e10377..899c0dc 100644
--- a/docs/html/guide/developing/tools/index.jd
+++ b/docs/html/guide/developing/tools/index.jd
@@ -90,6 +90,11 @@ efficiency.
level events. You can use the Monkey to stress-test applications that you are developing,
in a random yet repeatable manner.</dd>
+ <dt><a href="monkeyrunner_concepts.html">monkeyrunner</a></dt>
+ <dd>
+ The monkeyrunner tool provides an API for writing Python programs that control an Android device
+ or emulator from outside of Android code.
+ </dd>
<dt><a href="othertools.html#android">android</a></dt>
<dd>A script that lets you manage AVDs and generate <a
href="http://ant.apache.org/" title="Ant">Ant</a> build files that