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

am 5580e44c: Merge "Support changing style parent in overlays"

Browse Source 
* commit '5580e44c250944f5cd011b2682eea5cc2de9706c':
  Support changing style parent in overlays
This commit is contained in:
Jean-Baptiste Queru
2010-11-05 14:05:41 -07:00
committed by Android Git Automerger
parent 8806fc729b 5580e44c25
commit 3442611ee1
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

@@ -1724,13 +1724,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);
}
@@ -1778,13 +1771,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);
}