diff options
| author | Raphael <raphael@google.com> | 2010-11-03 10:58:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-03 10:58:47 -0700 |
| commit | 54e460f49f4c800a1ff9d1e6316232fb0800c2dc (patch) | |
| tree | 70193b19dcaa7c5a491f93b7e259a86ee8e46d56 /core | |
| parent | 1547423cc935799e69b67aee77e05e80ab3b8f95 (diff) | |
| parent | 19ed73ae7fddf66b335a89a33d346a5b50c1f274 (diff) | |
| download | frameworks_base-54e460f49f4c800a1ff9d1e6316232fb0800c2dc.zip frameworks_base-54e460f49f4c800a1ff9d1e6316232fb0800c2dc.tar.gz frameworks_base-54e460f49f4c800a1ff9d1e6316232fb0800c2dc.tar.bz2 | |
am 19ed73ae: am 46468dde: Merge "Support for <compatible-screens><screen> in ADT." into gingerbread
* commit '19ed73ae7fddf66b335a89a33d346a5b50c1f274':
Support for <compatible-screens><screen> in ADT.
Diffstat (limited to 'core')
| -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 065c10d..1ee8271 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1445,7 +1445,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"> |