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

Merge "Use direct reference to enum in AaptAssets"

Browse Source
This commit is contained in:
Kenny Root
2010-02-19 13:12:07 -08:00
committed by Android (Google) Code Review
parent bc92766cfd e599f78e77
commit ea25183196
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/aapt/AaptAssets.cpp
View File

@@ -985,14 +985,14 @@ bool AaptGroupEntry::getNavHiddenName(const char* name,
uint8_t mask = 0;
uint8_t value = 0;
if (strcmp(name, kWildcardName) == 0) {
mask = out->MASK_NAVHIDDEN;
value = out->NAVHIDDEN_ANY;
mask = ResTable_config::MASK_NAVHIDDEN;
value = ResTable_config::NAVHIDDEN_ANY;
} else if (strcmp(name, "navexposed") == 0) {
mask = out->MASK_NAVHIDDEN;
value = out->NAVHIDDEN_NO;
mask = ResTable_config::MASK_NAVHIDDEN;
value = ResTable_config::NAVHIDDEN_NO;
} else if (strcmp(name, "navhidden") == 0) {
mask = out->MASK_NAVHIDDEN;
value = out->NAVHIDDEN_YES;
mask = ResTable_config::MASK_NAVHIDDEN;
value = ResTable_config::NAVHIDDEN_YES;
}
if (mask != 0) {