Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support changing style parent in overlays"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-11-04 07:26:37 -07:00
committed by Android Code Review
parent db2403ff32 2fda9f4562
commit 5580e44c25
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/aapt/ResourceTable.cpp
View File

@@ -1629,13 +1629,6 @@ status_t ResourceTable::startBag(const SourcePos& sourcePos,
// If a parent is explicitly specified, set it.
if (bagParent.size() > 0) {
String16 curPar = e->getParent();
if (curPar.size() > 0 && curPar != bagParent) {
sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n",
String8(e->getParent()).string(),
String8(bagParent).string());
return UNKNOWN_ERROR;
}
e->setParent(bagParent);
}
@@ -1683,13 +1676,6 @@ status_t ResourceTable::addBag(const SourcePos& sourcePos,
// If a parent is explicitly specified, set it.
if (bagParent.size() > 0) {
String16 curPar = e->getParent();
if (curPar.size() > 0 && curPar != bagParent) {
sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n",
String8(e->getParent()).string(),
String8(bagParent).string());
return UNKNOWN_ERROR;
}
e->setParent(bagParent);
}