merge from open-source master

[android/aapt.git] / Resource.cpp

diff --git a/Resource.cpp b/Resource.cpp
index 1084992116021fc053a1407bec5d6b161cfe1c12..fdcada44a50d32448fbcb9ef7c4d68186bf0208a 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -1285,10 +1285,10 @@ static status_t writeLayoutClasses(
                     hasTable = true;
                     fprintf(fp,
                             "%s   <p>Includes the following attributes:</p>\n"
                     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   <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,
                             indentStr,
                             indentStr,
                             indentStr,


@@ -1322,7 +1322,7 @@ static status_t writeLayoutClasses(
                 }
                 String16 name(name8);
                 fixupSymbol(&name);
                 }
                 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(),
                         indentStr, nclassName.string(),
                         String8(name).string(),
                         assets->getPackage().string(),