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 /core/jni | |
| 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 'core/jni')
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index daf5a61..db495dd 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -999,6 +999,13 @@ static jint android_content_AssetManager_loadThemeAttributeValue( return block >= 0 ? copyValue(env, outValue, &res, value, ref, block, typeSpecFlags) : block; } +static jint android_content_AssetManager_getThemeChangingConfigurations(JNIEnv* env, jobject clazz, + jlong themeHandle) +{ + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeHandle); + return theme->getChangingConfigurations(); +} + static void android_content_AssetManager_dumpTheme(JNIEnv* env, jobject clazz, jlong themeHandle, jint pri, jstring tag, jstring prefix) @@ -2103,6 +2110,8 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_copyTheme }, { "loadThemeAttributeValue", "(JILandroid/util/TypedValue;Z)I", (void*) android_content_AssetManager_loadThemeAttributeValue }, + { "getThemeChangingConfigurations", "(J)I", + (void*) android_content_AssetManager_getThemeChangingConfigurations }, { "dumpTheme", "(JILjava/lang/String;Ljava/lang/String;)V", (void*) android_content_AssetManager_dumpTheme }, { "applyStyle","(JIIJ[I[I[I)Z", |