From 150f8b476d622b592ce9192aed2e106076f2f67e Mon Sep 17 00:00:00 2001
From: Andrey Epin <ayepin@google.com>
Date: Tue, 31 Jan 2023 14:09:01 -0800
Subject: Enable scrollable image preview view

Enable scrollable image preview view under a feature flag.

Bug: 262280076
Test: manual test
Test: atest IntentResolverUnitTests with the both flag values
Change-Id: I86050f1e9193412d15fb35a162a0405cf8287401
---
 java/res/layout/chooser_grid_preview_image.xml     |  6 +-
 java/res/layout/chooser_image_preview_view.xml     | 24 +++++++
 .../chooser_image_preview_view_internals.xml       | 73 ++++++++++++++++++++++
 java/res/layout/image_preview_view.xml             | 73 ----------------------
 java/res/layout/scrollable_image_preview_view.xml  | 24 +++++++
 5 files changed, 124 insertions(+), 76 deletions(-)
 create mode 100644 java/res/layout/chooser_image_preview_view.xml
 create mode 100644 java/res/layout/chooser_image_preview_view_internals.xml
 delete mode 100644 java/res/layout/image_preview_view.xml
 create mode 100644 java/res/layout/scrollable_image_preview_view.xml

(limited to 'java/res/layout')

diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml
index d43a26de..6af0af11 100644
--- a/java/res/layout/chooser_grid_preview_image.xml
+++ b/java/res/layout/chooser_grid_preview_image.xml
@@ -16,7 +16,6 @@
 * limitations under the License.
 */
 -->
-<!-- Layout Option: Supporting up to 3 images for preview -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
@@ -32,8 +31,9 @@
       android:gravity="center_horizontal"
       android:layout_marginBottom="@dimen/chooser_view_spacing">
 
-      <com.android.intentresolver.widget.ChooserImagePreviewView
-          android:id="@androidprv:id/content_preview_image_area"
+      <ViewStub
+          android:id="@+id/image_preview_stub"
+          android:inflatedId="@androidprv:id/content_preview_image_area"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:paddingStart="@dimen/chooser_edge_margin_normal"
diff --git a/java/res/layout/chooser_image_preview_view.xml b/java/res/layout/chooser_image_preview_view.xml
new file mode 100644
index 00000000..a111b923
--- /dev/null
+++ b/java/res/layout/chooser_image_preview_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.android.intentresolver.widget.ChooserImagePreviewView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:paddingBottom="@dimen/chooser_view_spacing"
+    android:background="?android:attr/colorBackground" />
diff --git a/java/res/layout/chooser_image_preview_view_internals.xml b/java/res/layout/chooser_image_preview_view_internals.xml
new file mode 100644
index 00000000..8730fc30
--- /dev/null
+++ b/java/res/layout/chooser_image_preview_view_internals.xml
@@ -0,0 +1,73 @@
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<merge
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:paddingBottom="@dimen/chooser_view_spacing"
+    android:background="?android:attr/colorBackground">
+
+    <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_alignParentTop="true"
+        android:adjustViewBounds="true"
+        android:gravity="center"
+        android:scaleType="centerCrop"/>
+
+    <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_alignParentTop="true"
+        android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
+        android:layout_marginLeft="10dp"
+        android:adjustViewBounds="true"
+        android:gravity="center"
+        android:scaleType="centerCrop"/>
+
+    <com.android.intentresolver.widget.RoundedRectImageView
+        android:id="@androidprv:id/content_preview_image_2_small"
+        android:visibility="gone"
+        android:layout_width="120dp"
+        android:layout_height="65dp"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
+        android:layout_marginLeft="10dp"
+        android:adjustViewBounds="true"
+        android:gravity="center"
+        android:scaleType="centerCrop"/>
+
+    <com.android.intentresolver.widget.RoundedRectImageView
+        android:id="@androidprv:id/content_preview_image_3_small"
+        android:visibility="gone"
+        android:layout_width="120dp"
+        android:layout_height="65dp"
+        android:layout_below="@androidprv:id/content_preview_image_2_small"
+        android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:adjustViewBounds="true"
+        android:gravity="center"
+        android:scaleType="centerCrop"/>
+
+</merge>
diff --git a/java/res/layout/image_preview_view.xml b/java/res/layout/image_preview_view.xml
deleted file mode 100644
index 8730fc30..00000000
--- a/java/res/layout/image_preview_view.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  ~ Copyright (C) 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:paddingBottom="@dimen/chooser_view_spacing"
-    android:background="?android:attr/colorBackground">
-
-    <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_alignParentTop="true"
-        android:adjustViewBounds="true"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
-
-    <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_alignParentTop="true"
-        android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
-        android:layout_marginLeft="10dp"
-        android:adjustViewBounds="true"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
-
-    <com.android.intentresolver.widget.RoundedRectImageView
-        android:id="@androidprv:id/content_preview_image_2_small"
-        android:visibility="gone"
-        android:layout_width="120dp"
-        android:layout_height="65dp"
-        android:layout_alignParentTop="true"
-        android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
-        android:layout_marginLeft="10dp"
-        android:adjustViewBounds="true"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
-
-    <com.android.intentresolver.widget.RoundedRectImageView
-        android:id="@androidprv:id/content_preview_image_3_small"
-        android:visibility="gone"
-        android:layout_width="120dp"
-        android:layout_height="65dp"
-        android:layout_below="@androidprv:id/content_preview_image_2_small"
-        android:layout_toRightOf="@androidprv:id/content_preview_image_1_large"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:adjustViewBounds="true"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
-
-</merge>
diff --git a/java/res/layout/scrollable_image_preview_view.xml b/java/res/layout/scrollable_image_preview_view.xml
new file mode 100644
index 00000000..ff2f273f
--- /dev/null
+++ b/java/res/layout/scrollable_image_preview_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.android.intentresolver.widget.ScrollableImagePreviewView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:paddingBottom="@dimen/chooser_view_spacing"
+    android:background="?android:attr/colorBackground" />
-- 
cgit v1.2.3-59-g8ed1b