From ad35f5e4fcd2e34750289fa1f9820579b2661f0c Mon Sep 17 00:00:00 2001 From: Sam Judd Date: Thu, 24 Feb 2022 10:45:45 -0800 Subject: [PATCH] Default on animated webp decoding in Glide on P+ PiperOrigin-RevId: 430741092 --- .../src/main/java/com/bumptech/glide/GlideBuilder.java | 10 ---------- .../main/java/com/bumptech/glide/RegistryFactory.java | 4 +--- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/library/src/main/java/com/bumptech/glide/GlideBuilder.java b/library/src/main/java/com/bumptech/glide/GlideBuilder.java index 9e776de836..db18271180 100644 --- a/library/src/main/java/com/bumptech/glide/GlideBuilder.java +++ b/library/src/main/java/com/bumptech/glide/GlideBuilder.java @@ -487,14 +487,6 @@ public GlideBuilder setImageDecoderEnabledForBitmaps(boolean isEnabled) { return this; } - /** This is an experimental method, it may be removed or changed at any future version. */ - public GlideBuilder setEnableImageDecoderForAnimatedWebp( - boolean enableImageDecoderForAnimatedWebp) { - glideExperimentsBuilder.update( - new EnableImageDecoderForAnimatedWebp(), enableImageDecoderForAnimatedWebp); - return this; - } - void setRequestManagerFactory(@Nullable RequestManagerFactory factory) { this.requestManagerFactory = factory; } @@ -606,8 +598,6 @@ private WaitForFramesAfterTrimMemory() {} static final class EnableImageDecoderForBitmaps implements Experiment {} - static final class EnableImageDecoderForAnimatedWebp implements Experiment {} - /** See {@link #setLogRequestOrigins(boolean)}. */ public static final class LogRequestOrigins implements Experiment {} diff --git a/library/src/main/java/com/bumptech/glide/RegistryFactory.java b/library/src/main/java/com/bumptech/glide/RegistryFactory.java index da7fe43a4e..736ab6ec08 100644 --- a/library/src/main/java/com/bumptech/glide/RegistryFactory.java +++ b/library/src/main/java/com/bumptech/glide/RegistryFactory.java @@ -12,7 +12,6 @@ import android.os.ParcelFileDescriptor; import androidx.annotation.Nullable; import androidx.tracing.Trace; -import com.bumptech.glide.GlideBuilder.EnableImageDecoderForAnimatedWebp; import com.bumptech.glide.GlideBuilder.EnableImageDecoderForBitmaps; import com.bumptech.glide.gifdecoder.GifDecoder; import com.bumptech.glide.load.ImageHeaderParser; @@ -164,8 +163,7 @@ private static void initializeDefaults( streamBitmapDecoder = new StreamBitmapDecoder(downsampler, arrayPool); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P - && experiments.isEnabled(EnableImageDecoderForAnimatedWebp.class)) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { registry.append( Registry.BUCKET_ANIMATION, InputStream.class,