Fixes a bug in gms

PiperOrigin-RevId: 482613746
bumptech · Oct 20, 2022 · e1366e5 · e1366e5
1 parent 26a393b
commit e1366e5
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/library/src/main/java/com/bumptech/glide/load/resource/drawable/DrawableDecoderCompat.java b/library/src/main/java/com/bumptech/glide/load/resource/drawable/DrawableDecoderCompat.java
@@ -4,6 +4,8 @@
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.graphics.drawable.Drawable;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
@@ -65,13 +67,19 @@ private static Drawable getDrawable(
 
   private static Drawable loadDrawableV7(
       Context context, @DrawableRes int id, @Nullable Theme theme) {
-    Context resourceContext = theme != null ? new ContextThemeWrapper(context, theme) : context;
+    Context resourceContext;
+    if (theme != null && VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+      ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(context, theme);
+      contextThemeWrapper.applyOverrideConfiguration(theme.getResources().getConfiguration());
+      resourceContext = contextThemeWrapper;
+    } else {
+      resourceContext = context;
+    }
     return AppCompatResources.getDrawable(resourceContext, id);
   }
 
   private static Drawable loadDrawableV4(
       Context context, @DrawableRes int id, @Nullable Theme theme) {
-    Resources resources = context.getResources();
-    return ResourcesCompat.getDrawable(resources, id, theme);
+    return ResourcesCompat.getDrawable(context.getResources(), id, theme);
   }
 }