Fixes a bug in gms

PiperOrigin-RevId: 481179115
bumptech · Oct 14, 2022 · ef64c38 · ef64c38
1 parent 08c9f72
commit ef64c38
Showing 1 changed file with 2 additions and 18 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,8 +4,6 @@
 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;
@@ -67,27 +65,13 @@ private static Drawable getDrawable(
 
   private static Drawable loadDrawableV7(
       Context context, @DrawableRes int id, @Nullable Theme theme) {
-    Context resourceContext;
-    if (theme != null) {
-      ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(context, theme);
-      if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-        contextThemeWrapper.applyOverrideConfiguration(theme.getResources().getConfiguration());
-      }
-      resourceContext = contextThemeWrapper;
-    } else {
-      resourceContext = context;
-    }
+    Context resourceContext = theme != null ? new ContextThemeWrapper(context, theme) : context;
     return AppCompatResources.getDrawable(resourceContext, id);
   }
 
   private static Drawable loadDrawableV4(
       Context context, @DrawableRes int id, @Nullable Theme theme) {
-    Resources resources;
-    if (theme != null && VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-      resources = theme.getResources();
-    } else {
-      resources = context.getResources();
-    }
+    Resources resources = context.getResources();
     return ResourcesCompat.getDrawable(resources, id, theme);
   }
 }