Merge "Revert "Add headline to sharesheet."" into udc-dev

4 files changed, 31 insertions, 62 deletions

diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml
index 036c5318..6ba06b3d 100644
--- a/java/res/layout/chooser_grid_preview_file.xml
+++ b/java/res/layout/chooser_grid_preview_file.xml
@@ -27,8 +27,6 @@
     android:paddingBottom="@dimen/chooser_view_spacing"
     android:background="?android:attr/colorBackground">
 
-  <include layout="@layout/chooser_headline_row" />
-
   <LinearLayout
       android:layout_width="@dimen/chooser_preview_width"
       android:layout_height="wrap_content"
@@ -71,6 +69,14 @@
         android:textAppearance="@style/TextAppearance.ChooserDefault" />
   </LinearLayout>
 
+  <TextView
+      android:id="@+id/reselection_action"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:visibility="gone"
+      android:gravity="center"
+      style="@style/ReselectionAction" />
+
   <ViewStub
       android:id="@+id/action_row_stub"
       android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml
index 9ad594e8..1c0e4c2e 100644
--- a/java/res/layout/chooser_grid_preview_image.xml
+++ b/java/res/layout/chooser_grid_preview_image.xml
@@ -24,7 +24,13 @@
     android:orientation="vertical"
     android:background="?android:attr/colorBackground">
 
-    <include layout="@layout/chooser_headline_row" />
+  <CheckBox
+      android:id="@+id/include_text_action"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="end"
+      android:layout_marginEnd="@dimen/chooser_edge_margin_normal"
+      android:visibility="gone" />
 
   <LinearLayout
       android:layout_width="match_parent"
@@ -53,6 +59,14 @@
           android:textAppearance="@style/TextAppearance.ChooserDefault" />
   </LinearLayout>
 
+  <TextView
+      android:id="@+id/reselection_action"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:visibility="gone"
+      android:gravity="center"
+      style="@style/ReselectionAction" />
+
   <ViewStub
       android:id="@+id/action_row_stub"
       android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml
index 47beaa5a..f521e31d 100644
--- a/java/res/layout/chooser_grid_preview_text.xml
+++ b/java/res/layout/chooser_grid_preview_text.xml
@@ -26,8 +26,6 @@
     android:orientation="vertical"
     android:background="?android:attr/colorBackground">
 
-  <include layout="@layout/chooser_headline_row" />
-
   <RelativeLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -84,6 +82,14 @@
         android:focusable="true"/>
   </RelativeLayout>
 
+  <TextView
+      android:id="@+id/reselection_action"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:visibility="gone"
+      android:gravity="center"
+      style="@style/ReselectionAction" />
+
   <ViewStub
       android:id="@+id/action_row_stub"
       android:layout_width="match_parent"
diff --git a/java/res/layout/chooser_headline_row.xml b/java/res/layout/chooser_headline_row.xml
deleted file mode 100644
index 9dfab892..00000000
--- a/java/res/layout/chooser_headline_row.xml
+++ /dev/null
@@ -1,57 +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.
-  -->
-
-<RelativeLayout
-    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"
-    android:paddingHorizontal="@dimen/chooser_edge_margin_normal"
->
-    <TextView
-        android:id="@+id/headline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_alignParentStart="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:fontFamily="@androidprv:string/config_headlineFontFamily"
-        android:textSize="18sp"
-        android:paddingBottom="16dp"
-        />
-
-    <TextView
-        android:id="@+id/reselection_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:visibility="gone"
-        android:paddingBottom="16dp"
-        style="@style/ReselectionAction" />
-
-    <!-- This is only relevant for image+text preview, but needs to be in this layout so it can
-         stay at the top if there's no reselection action. -->
-    <CheckBox
-        android:id="@+id/include_text_action"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@id/reselection_action"
-        android:layout_alignWithParentIfMissing="true"
-        android:visibility="gone" />
-
-</RelativeLayout>