Merge changes from topic "mrcasey-customactionflag" into udc-dev

* changes:
  Remove SHARESHEET_SCROLLABLE_IMAGE_PREVIEW
  Remove usage of SHARESHEET_IMAGE_AND_TEXT_PREVIEW
  Remove flag SHARESHEET_RESELECTION_ACTION
  Remove SHARESHEET_CUSTOM_ACTIONS flag usage

3 files changed, 0 insertions, 131 deletions

diff --git a/java/res/layout/chooser_action_row.xml b/java/res/layout/chooser_action_row.xml
deleted file mode 100644
index 620ff704..00000000
--- a/java/res/layout/chooser_action_row.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ~ Copyright (C) 2019 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
-  -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.android.intentresolver.widget.ChooserActionRow
-        android:id="@androidprv:id/chooser_action_row"
-        android:layout_width="@dimen/chooser_preview_width"
-        android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/chooser_edge_margin_normal"
-        android:paddingRight="@dimen/chooser_edge_margin_normal"
-        android:layout_marginBottom="@dimen/chooser_view_spacing"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/java/res/layout/chooser_image_preview_view.xml b/java/res/layout/chooser_image_preview_view.xml
deleted file mode 100644
index e81349c7..00000000
--- a/java/res/layout/chooser_image_preview_view.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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:paddingStart="@dimen/chooser_edge_margin_normal"
-    android:paddingEnd="@dimen/chooser_edge_margin_normal"
-    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
deleted file mode 100644
index 2b93edf8..00000000
--- a/java/res/layout/chooser_image_preview_view_internals.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="@dimen/chooser_preview_image_width"
-        android:layout_height="@dimen/chooser_preview_image_height"
-        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="@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"
-        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="@dimen/chooser_preview_image_width"
-        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="@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"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="10dp"
-        android:adjustViewBounds="true"
-        android:gravity="center"
-        android:scaleType="centerCrop"/>
-
-</merge>