X-Git-Url: https://git.saurik.com/android/aapt.git/blobdiff_plain/681e0c62435715da0dde10840e2fce4ebed23aed..6dfccf061b505abafb2da9f5debf03ddb0210141:/ResourceTable.cpp diff --git a/ResourceTable.cpp b/ResourceTable.cpp index 3cf6a71..b3cf7ea 100644 --- a/ResourceTable.cpp +++ b/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, @@ -1587,7 +1587,7 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos, sourcePos.file.striing(), sourcePos.line, String8(type).string()); } #endif - if (overlay && !hasBagOrEntry(package, type, name)) { + if (overlay && !mBundle->getAutoAddOverlay() && !hasBagOrEntry(package, type, name)) { bool canAdd = false; sp<Package> p = mPackages.valueFor(package); if (p != NULL) { @@ -3275,12 +3275,13 @@ sp<ResourceTable::Entry> ResourceTable::Type::getEntry(const String16& entry, const SourcePos& sourcePos, const ResTable_config* config, bool doSetIndex, - bool overlay) + bool overlay, + bool autoAddOverlay) { int pos = -1; sp<ConfigList> c = mConfigs.valueFor(entry); if (c == NULL) { - if (overlay == true && mCanAddEntries.indexOf(entry) < 0) { + if (overlay && !autoAddOverlay && mCanAddEntries.indexOf(entry) < 0) { sourcePos.error("Resource at %s appears in overlay but not" " in the base package; use <add-resource> to add.\n", String8(entry).string()); @@ -3592,7 +3593,7 @@ sp<ResourceTable::Entry> ResourceTable::getEntry(const String16& package, if (t == NULL) { return NULL; } - return t->getEntry(name, sourcePos, config, doSetIndex, overlay); + return t->getEntry(name, sourcePos, config, doSetIndex, overlay, mBundle->getAutoAddOverlay()); } sp<const ResourceTable::Entry> ResourceTable::getEntry(uint32_t resID,