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

Drawable: fix theme not getting passed to newly inflated drawables

Browse Source 
When Theme support was added, not everything was immediately updated
to use theme information properly. This was fixed in a lot of places
since then, but it seems not here.
This commit is contained in:
Mis012
2025-02-27 01:08:54 +01:00
parent 8afb1a0fe2
commit ca39c81224
6 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api-impl/android/graphics/drawable/LayerDrawable.java
View File

@@ -17,6 +17,7 @@
package android.graphics.drawable;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
@@ -106,13 +107,13 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
}
// @Override
public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs)
public void inflate(Resources r, XmlPullParser parser, AttributeSet attrs, Theme theme)
throws XmlPullParserException, IOException {
//super.inflate(r, parser, attrs);
int type;
TypedArray a = r.obtainAttributes(attrs, com.android.internal.R.styleable.LayerDrawable);
TypedArray a = obtainAttributes(r, theme, attrs, com.android.internal.R.styleable.LayerDrawable);
// mOpacityOverride = a.getInt(com.android.internal.R.styleable.LayerDrawable_opacity, PixelFormat.UNKNOWN);
@@ -131,7 +132,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
continue;
}
a = r.obtainAttributes(attrs,
a = obtainAttributes(r, theme, attrs,
com.android.internal.R.styleable.LayerDrawableItem);
int left = a.getDimensionPixelOffset(
@@ -159,7 +160,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
throw new XmlPullParserException(parser.getPositionDescription() + ": <item> tag requires a 'drawable' attribute or "
+ "child tag defining a drawable");
}
dr = Drawable.createFromXmlInner(r, parser, attrs);
dr = Drawable.createFromXmlInner(r, parser, attrs, theme);
}
if (dr != null)