diff options
| author | Alan Viverette <alanv@google.com> | 2015-05-07 21:19:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 21:19:59 +0000 |
| commit | 6a8c79bb2b4b0c749e76dc3628ec5200efec4f40 (patch) | |
| tree | 002d055790131d35f38e5a4d0ff68b198e6f1714 /core/jni | |
| parent | 6fc03e6523ee566ed278c3b64aa344ae95c8d824 (diff) | |
| parent | e54d245b993e1347cb32c23a6bdc907a45fab324 (diff) | |
| download | frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.zip frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.tar.gz frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.tar.bz2 | |
Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index db495dd..74a9e4e 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -976,6 +976,12 @@ static void android_content_AssetManager_copyTheme(JNIEnv* env, jobject clazz, dest->setTo(*src); } +static void android_content_AssetManager_clearTheme(JNIEnv* env, jobject clazz, jlong themeHandle) +{ + ResTable::Theme* theme = reinterpret_cast<ResTable::Theme*>(themeHandle); + theme->clear(); +} + static jint android_content_AssetManager_loadThemeAttributeValue( JNIEnv* env, jobject clazz, jlong themeHandle, jint ident, jobject outValue, jboolean resolve) { @@ -2108,6 +2114,8 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_applyThemeStyle }, { "copyTheme", "(JJ)V", (void*) android_content_AssetManager_copyTheme }, + { "clearTheme", "(J)V", + (void*) android_content_AssetManager_clearTheme }, { "loadThemeAttributeValue", "(JILandroid/util/TypedValue;Z)I", (void*) android_content_AssetManager_loadThemeAttributeValue }, { "getThemeChangingConfigurations", "(J)I", |