atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

AssetManager: applyStyle: handle "style" value being an attribute, append styles to global theme instead of replacing it

Browse Source
This commit is contained in:
Mis012
2024-04-07 21:55:16 +02:00
parent db4add0842
commit 0f14370c8b
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/api-impl/android/content/res/AssetManager.java
View File

@@ -767,11 +767,22 @@ public final class AssetManager {
TypedValue value = new TypedValue();
if (defStyleRes == 0 && theme != 0 && loadThemeAttributeValue(theme, defStyleAttr, value, true) >= 0)
defStyleRes = value.data;
if (defStyleRes == 0 && set != null)
defStyleRes = set.getAttributeResourceValue(null, "style", 0);
if (defStyleRes == 0 && set != null) {
int styleVal = set.getAttributeResourceValue(null, "style", 0);
if(((styleVal >> 16) & 0xff) == 0x3) { // attribute
if (theme != 0 && loadThemeAttributeValue(theme, styleVal, value, true) >= 0)
defStyleRes = value.data;
}
else {
defStyleRes = styleVal;
}
}
long defStyle = 0;
if (defStyleRes != 0) {
defStyle = newTheme();
if(theme != 0)
copyTheme(defStyle, theme);
applyThemeStyle(defStyle, defStyleRes, true);
}