From 1d9b80bad8984a6b2c4d6277e162de07ded7bd41 Mon Sep 17 00:00:00 2001
From: Andrey Epin <ayepin@google.com>
Date: Fri, 17 Feb 2023 15:25:15 -0800
Subject: Add image caching to ImagePreviewImageLoader

ScrollableImagePreviewView being a RecyclerView may reattache its
children multiple times and rely on the ImageLoader to implement any
image retrival optimizations.

Fix: 269797062
Test: manual test, unit tests
Change-Id: I256f4a78a677e939f717fee5dd82492ec572bc65
---
 java/res/layout/chooser_image_preview_view_internals.xml | 12 ++++++------
 java/res/layout/image_preview_image_item.xml             |  4 ++--
 java/res/values/dimens.xml                               |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'java/res')

diff --git a/java/res/layout/chooser_image_preview_view_internals.xml b/java/res/layout/chooser_image_preview_view_internals.xml
index 8730fc30..2b93edf8 100644
--- a/java/res/layout/chooser_image_preview_view_internals.xml
+++ b/java/res/layout/chooser_image_preview_view_internals.xml
@@ -26,8 +26,8 @@
     <com.android.intentresolver.widget.RoundedRectImageView
         android:id="@androidprv:id/content_preview_image_1_large"
         android:transitionName="screenshot_preview_image"
-        android:layout_width="120dp"
-        android:layout_height="104dp"
+        android:layout_width="@dimen/chooser_preview_image_width"
+        android:layout_height="@dimen/chooser_preview_image_height"
         android:layout_alignParentTop="true"
         android:adjustViewBounds="true"
         android:gravity="center"
@@ -36,8 +36,8 @@
     <com.android.intentresolver.widget.RoundedRectImageView
         android:id="@androidprv:id/content_preview_image_2_large"
         android:visibility="gone"
-        android:layout_width="120dp"
-        android:layout_height="104dp"
+        android:layout_width="@dimen/chooser_preview_image_width"
+        android:layout_height="@dimen/chooser_preview_image_height"
         android:layout_alignParentTop="true"
         android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
         android:layout_marginLeft="10dp"
@@ -48,7 +48,7 @@
     <com.android.intentresolver.widget.RoundedRectImageView
         android:id="@androidprv:id/content_preview_image_2_small"
         android:visibility="gone"
-        android:layout_width="120dp"
+        android:layout_width="@dimen/chooser_preview_image_width"
         android:layout_height="65dp"
         android:layout_alignParentTop="true"
         android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
@@ -60,7 +60,7 @@
     <com.android.intentresolver.widget.RoundedRectImageView
         android:id="@androidprv:id/content_preview_image_3_small"
         android:visibility="gone"
-        android:layout_width="120dp"
+        android:layout_width="@dimen/chooser_preview_image_width"
         android:layout_height="65dp"
         android:layout_below="@androidprv:id/content_preview_image_2_small"
         android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
diff --git a/java/res/layout/image_preview_image_item.xml b/java/res/layout/image_preview_image_item.xml
index 3895b6b4..c18cc279 100644
--- a/java/res/layout/image_preview_image_item.xml
+++ b/java/res/layout/image_preview_image_item.xml
@@ -17,8 +17,8 @@
 <com.android.intentresolver.widget.RoundedRectImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/image"
-    android:layout_width="120dp"
-    android:layout_height="104dp"
+    android:layout_width="@dimen/chooser_preview_image_width"
+    android:layout_height="@dimen/chooser_preview_image_height"
     android:layout_alignParentTop="true"
     android:adjustViewBounds="false"
     android:scaleType="centerCrop"/>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 93cb4637..87eec7fb 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -25,6 +25,8 @@
     <dimen name="chooser_edge_margin_normal">24dp</dimen>
     <dimen name="chooser_preview_image_font_size">20sp</dimen>
     <dimen name="chooser_preview_image_border">1dp</dimen>
+    <dimen name="chooser_preview_image_width">120dp</dimen>
+    <dimen name="chooser_preview_image_height">104dp</dimen>
     <dimen name="chooser_preview_image_max_dimen">200dp</dimen>
     <dimen name="chooser_preview_width">-1px</dimen>
     <dimen name="chooser_header_scroll_elevation">4dp</dimen>
-- 
cgit v1.2.3-59-g8ed1b