diff options
| author | Raphael <raphael@google.com> | 2010-11-02 11:43:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-02 11:43:11 -0700 |
| commit | 46468dde8d7f9bd42ad180c2882bff6ef98685cd (patch) | |
| tree | d5e0726e6212c37245820127efbcd7c15f26c55c | |
| parent | 18149c47bfc87c88798e6820d7153e588b374ed3 (diff) | |
| parent | 04194ecf3ada774425b9a00dfc44f28034f66f5c (diff) | |
| download | frameworks_base-46468dde8d7f9bd42ad180c2882bff6ef98685cd.zip frameworks_base-46468dde8d7f9bd42ad180c2882bff6ef98685cd.tar.gz frameworks_base-46468dde8d7f9bd42ad180c2882bff6ef98685cd.tar.bz2 | |
Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 3 |
1 files changed, 2 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"> |