diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-05 16:50:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 16:50:29 +0000 |
| commit | 261208e002775fe9a9f4e79e9f70b41852cfbe60 (patch) | |
| tree | 8892fb65af63b32037a23cebd66081e2a944cbce /libs | |
| parent | 28a516280a59a81aeecbf4a68057019d59feb872 (diff) | |
| parent | c1d527926e1c82828e42bdc0c7abf50f6decc0a7 (diff) | |
| download | frameworks_base-261208e002775fe9a9f4e79e9f70b41852cfbe60.zip frameworks_base-261208e002775fe9a9f4e79e9f70b41852cfbe60.tar.gz frameworks_base-261208e002775fe9a9f4e79e9f70b41852cfbe60.tar.bz2 | |
Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 04ebe70..19a5beb 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -3147,6 +3147,7 @@ struct ResTable::bag_set ResTable::Theme::Theme(const ResTable& table) : mTable(table) + , mTypeSpecFlags(0) { memset(mPackages, 0, sizeof(mPackages)); } @@ -3205,6 +3206,8 @@ status_t ResTable::Theme::applyStyle(uint32_t resID, bool force) return N; } + mTypeSpecFlags |= bagTypeSpecFlags; + uint32_t curPackage = 0xffffffff; ssize_t curPackageIndex = 0; package_info* curPI = NULL; @@ -3323,6 +3326,8 @@ status_t ResTable::Theme::setTo(const Theme& other) } } + mTypeSpecFlags = other.mTypeSpecFlags; + if (kDebugTableTheme) { ALOGI("Final theme:"); dumpToLog(); @@ -3417,6 +3422,11 @@ ssize_t ResTable::Theme::resolveAttributeReference(Res_value* inOutValue, inoutTypeSpecFlags, inoutConfig); } +uint32_t ResTable::Theme::getChangingConfigurations() const +{ + return mTypeSpecFlags; +} + void ResTable::Theme::dumpToLog() const { ALOGI("Theme %p:\n", this); |