diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2009-11-04 14:32:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-04 14:32:34 -0800 |
| commit | 5b40ead81bdd350c3f4a585d851d91e5bec0c5c6 (patch) | |
| tree | 176bb74d6962d29469007561a06f2bf0c3ab35ae /tools | |
| parent | 4360624241251035534a46449e23be38d9e6b03c (diff) | |
| parent | 0d55daffc31c123dcf83f6db85f8198854ddc564 (diff) | |
| download | frameworks_base-5b40ead81bdd350c3f4a585d851d91e5bec0c5c6.zip frameworks_base-5b40ead81bdd350c3f4a585d851d91e5bec0c5c6.tar.gz frameworks_base-5b40ead81bdd350c3f4a585d851d91e5bec0c5c6.tar.bz2 | |
am 0d55daff: am 5fc71e67: am 00e44ef2: Merge change I54545dfd into eclair-sdk
Merge commit '0d55daffc31c123dcf83f6db85f8198854ddc564' into eclair-mr2-plus-aosp
* commit '0d55daffc31c123dcf83f6db85f8198854ddc564':
doc change: fix broken R.styleable formatting (caused by missing periods). Adjust table markup.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/Resource.cpp | 6 | ||||
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 10849921..fdcada4 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1285,10 +1285,10 @@ static status_t writeLayoutClasses( hasTable = true; fprintf(fp, "%s <p>Includes the following attributes:</p>\n" - "%s <table border=\"2\" width=\"85%%\" align=\"center\" frame=\"hsides\" rules=\"all\" cellpadding=\"5\">\n" + "%s <table>\n" "%s <colgroup align=\"left\" />\n" "%s <colgroup align=\"left\" />\n" - "%s <tr><th>Attribute<th>Summary</tr>\n", + "%s <tr><th>Attribute</th><th>Description</th></tr>\n", indentStr, indentStr, indentStr, @@ -1322,7 +1322,7 @@ static status_t writeLayoutClasses( } String16 name(name8); fixupSymbol(&name); - fprintf(fp, "%s <tr><th><code>{@link #%s_%s %s:%s}</code><td>%s</tr>\n", + fprintf(fp, "%s <tr><td><code>{@link #%s_%s %s:%s}</code></td><td>%s</td></tr>\n", indentStr, nclassName.string(), String8(name).string(), assets->getPackage().string(), diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 3cf6a71..19b9b01 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -480,22 +480,22 @@ static status_t compileAttribute(const sp<AaptFile>& in, enumOrFlagsComment.append((attr.type&ResTable_map::TYPE_ENUM) ? String16(" be one of the following constant values.") : String16(" be one or more (separated by '|') of the following constant values.")); - enumOrFlagsComment.append(String16("</p>\n<table border=\"2\" width=\"85%\" align=\"center\" frame=\"hsides\" rules=\"all\" cellpadding=\"5\">\n" + enumOrFlagsComment.append(String16("</p>\n<table>\n" "<colgroup align=\"left\" />\n" "<colgroup align=\"left\" />\n" "<colgroup align=\"left\" />\n" - "<tr><th>Constant<th>Value<th>Description</tr>")); + "<tr><th>Constant</th><th>Value</th><th>Description</th></tr>")); } - enumOrFlagsComment.append(String16("\n<tr><th><code>")); + enumOrFlagsComment.append(String16("\n<tr><td><code>")); enumOrFlagsComment.append(itemIdent); - enumOrFlagsComment.append(String16("</code><td>")); + enumOrFlagsComment.append(String16("</code></td><td>")); enumOrFlagsComment.append(value); - enumOrFlagsComment.append(String16("<td>")); + enumOrFlagsComment.append(String16("</td><td>")); if (block.getComment(&len)) { enumOrFlagsComment.append(String16(block.getComment(&len))); } - enumOrFlagsComment.append(String16("</tr>")); + enumOrFlagsComment.append(String16("</td></tr>")); err = outTable->addBag(SourcePos(in->getPrintableSource(), block.getLineNumber()), myPackage, |