summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Aurimas Liutikas <aurimas@google.com> 2018-11-19 20:48:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-11-19 20:48:55 +0000
commit588bdc6719523ed2fca73abcaae81233709c2895 (patch)
tree4c2cd2f300c020acdd83b1efed06d2d30e3fb347 /libs/androidfw/AttributeResolution.cpp
parent2f6ef53ec63b16223d6ef07766c252deaba678eb (diff)
parentd42a670ee59618e98078079b554f2652035eb1e2 (diff)
Merge "Add style value to ResolvedBag in AssetManager2."
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
-rw-r--r--libs/androidfw/AttributeResolution.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AttributeResolution.cpp b/libs/androidfw/AttributeResolution.cpp
index f912af4f7190..57e3491895e6 100644
--- a/libs/androidfw/AttributeResolution.cpp
+++ b/libs/androidfw/AttributeResolution.cpp
@@ -310,7 +310,8 @@ void ApplyStyle(Theme* theme, ResXMLParser* xml_parser, uint32_t def_style_attr,
type_set_flags = style_flags;
value = entry->value;
if (kDebugStyles) {
- ALOGI("-> From style: type=0x%x, data=0x%08x", value.dataType, value.data);
+ ALOGI("-> From style: type=0x%x, data=0x%08x, style=0x%08x", value.dataType, value.data,
+ entry->style);
}
}
}
@@ -388,7 +389,6 @@ void ApplyStyle(Theme* theme, ResXMLParser* xml_parser, uint32_t def_style_attr,
// out_indices must NOT be nullptr.
out_indices[indices_idx] = ii;
}
-
out_values += STYLE_NUM_ENTRIES;
}