summaryrefslogtreecommitdiff
path: root/java/res
diff options
context:
space:
mode:
author Andrey Epin <ayepin@google.com> 2023-03-04 08:07:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-04 08:07:39 +0000
commitf07b271dede54d16407aa14dc111acba9beaab52 (patch)
treeb66125c4e9b8a546932154a9164e75c46aa272da /java/res
parenta3d4e87fea2779a88ee3e48aca397cf4d938d845 (diff)
parentf8bc5e7fd1f89a71129096f46bbda42caf29b404 (diff)
Merge "Add image caching to ImagePreviewImageLoader" into tm-qpr-dev am: d9a9fbb834 am: d2cb6ac684 am: f8bc5e7fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21487231 Change-Id: I0f24bd7de698a502fdf63cde6ac59f5abf61aafc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/chooser_image_preview_view_internals.xml12
-rw-r--r--java/res/layout/image_preview_image_item.xml4
-rw-r--r--java/res/values/dimens.xml2
3 files changed, 10 insertions, 8 deletions
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>