Provide XML drawable factory through PipelineDraweeController

Reviewed By: oprisnik

Differential Revision: D66678719

fbshipit-source-id: de3a4178e2241296741e00925a7f998d5fb52dae

Author: Abbondanzo

drawee-backends/drawee-pipeline/src/main/java/com/facebook/drawee/backends/pipeline/PipelineDraweeController.java

@@ -104,14 +104,16 @@ public class PipelineDraweeController
   public PipelineDraweeController(
       Resources resources,
       DeferredReleaser deferredReleaser,
-      DrawableFactory animatedDrawableFactory,
+      @Nullable DrawableFactory animatedDrawableFactory,
+      @Nullable DrawableFactory xmlDrawableFactory,
       Executor uiThreadExecutor,
       @Nullable MemoryCache<CacheKey, CloseableImage> memoryCache,
       @Nullable ImmutableList<DrawableFactory> globalDrawableFactories) {
     // NULLSAFE_FIXME[Parameter Not Nullable]
     super(deferredReleaser, uiThreadExecutor, null, null);
     mResources = resources;
-    mDefaultDrawableFactory = new DefaultDrawableFactory(resources, animatedDrawableFactory);
+    mDefaultDrawableFactory =
+        new DefaultDrawableFactory(resources, animatedDrawableFactory, xmlDrawableFactory);
     mGlobalDrawableFactories = globalDrawableFactories;
     mMemoryCache = memoryCache;
   }

drawee-backends/drawee-pipeline/src/main/java/com/facebook/drawee/backends/pipeline/PipelineDraweeControllerBuilderSupplier.java

@@ -65,8 +65,8 @@ public PipelineDraweeControllerBuilderSupplier(
     mPipelineDraweeControllerFactory.init(
         context.getResources(),
         DeferredReleaser.getInstance(),
-        // NULLSAFE_FIXME[Parameter Not Nullable]
         imagePipelineFactory.getAnimatedDrawableFactory(context),
+        imagePipelineFactory.getXmlDrawableFactory(),
         UiThreadImmediateExecutorService.getInstance(),
         mImagePipeline.getBitmapMemoryCache(),
         draweeConfig != null ? draweeConfig.getCustomDrawableFactories() : null,

drawee-backends/drawee-pipeline/src/main/java/com/facebook/drawee/backends/pipeline/PipelineDraweeControllerFactory.java

@@ -27,8 +27,8 @@ public class PipelineDraweeControllerFactory {
   private Resources mResources;
   // NULLSAFE_FIXME[Field Not Initialized]
   private DeferredReleaser mDeferredReleaser;
-  // NULLSAFE_FIXME[Field Not Initialized]
-  private DrawableFactory mAnimatedDrawableFactory;
+  @Nullable private DrawableFactory mAnimatedDrawableFactory;
+  @Nullable private DrawableFactory mXmlDrawableFactory;
   // NULLSAFE_FIXME[Field Not Initialized]
   private Executor mUiThreadExecutor;
   @Nullable private MemoryCache<CacheKey, CloseableImage> mMemoryCache;
@@ -38,14 +38,16 @@ public class PipelineDraweeControllerFactory {
   public void init(
       Resources resources,
       DeferredReleaser deferredReleaser,
-      DrawableFactory animatedDrawableFactory,
+      @Nullable DrawableFactory animatedDrawableFactory,
+      @Nullable DrawableFactory xmlDrawableFactory,
       Executor uiThreadExecutor,
       MemoryCache<CacheKey, CloseableImage> memoryCache,
       @Nullable ImmutableList<DrawableFactory> drawableFactories,
       @Nullable Supplier<Boolean> debugOverlayEnabledSupplier) {
     mResources = resources;
     mDeferredReleaser = deferredReleaser;
     mAnimatedDrawableFactory = animatedDrawableFactory;
+    mXmlDrawableFactory = xmlDrawableFactory;
     mUiThreadExecutor = uiThreadExecutor;
     mMemoryCache = memoryCache;
     mDrawableFactories = drawableFactories;
@@ -58,6 +60,7 @@ public PipelineDraweeController newController() {
             mResources,
             mDeferredReleaser,
             mAnimatedDrawableFactory,
+            mXmlDrawableFactory,
             mUiThreadExecutor,
             mMemoryCache,
             mDrawableFactories);
@@ -70,14 +73,16 @@ public PipelineDraweeController newController() {
   protected PipelineDraweeController internalCreateController(
       Resources resources,
       DeferredReleaser deferredReleaser,
-      DrawableFactory animatedDrawableFactory,
+      @Nullable DrawableFactory animatedDrawableFactory,
+      @Nullable DrawableFactory xmlDrawableFactory,
       Executor uiThreadExecutor,
       @Nullable MemoryCache<CacheKey, CloseableImage> memoryCache,
       @Nullable ImmutableList<DrawableFactory> drawableFactories) {
     return new PipelineDraweeController(
         resources,
         deferredReleaser,
         animatedDrawableFactory,
+        xmlDrawableFactory,
         uiThreadExecutor,
         memoryCache,
         drawableFactories);

imagepipeline/src/main/java/com/facebook/imagepipeline/decoder/DefaultImageDecoder.java

@@ -279,7 +279,7 @@ public CloseableStaticBitmap decodeJpeg(
    * @param encodedImage input image (encoded bytes plus meta data)
    * @param length amount of currently available data in bytes
    * @param qualityInfo quality info for the image
-   * @return a CloseableStaticBitmap
+   * @return a CloseableXml
    */
   private @Nullable CloseableImage decodeXml(
       final EncodedImage encodedImage,