Merge "Remove obsolete headline views from preview UI variants" into main

12 files changed, 21 insertions, 64 deletions

diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml
index 90832d23..4e8cf7ba 100644
--- a/java/res/layout/chooser_grid_preview_file.xml
+++ b/java/res/layout/chooser_grid_preview_file.xml
@@ -26,14 +26,6 @@
     android:orientation="vertical"
     android:background="?androidprv:attr/materialColorSurfaceContainer">
 
-    <ViewStub
-        android:id="@+id/chooser_headline_row_stub"
-        android:layout="@layout/chooser_headline_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/chooser_edge_margin_normal"
-        android:layout_marginBottom="@dimen/chooser_view_spacing" />
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/chooser_grid_preview_files_text.xml b/java/res/layout/chooser_grid_preview_files_text.xml
index e7747496..2756e800 100644
--- a/java/res/layout/chooser_grid_preview_files_text.xml
+++ b/java/res/layout/chooser_grid_preview_files_text.xml
@@ -25,14 +25,6 @@
     android:orientation="vertical"
     android:background="?androidprv:attr/materialColorSurfaceContainer">
 
-    <ViewStub
-        android:id="@+id/chooser_headline_row_stub"
-        android:layout="@layout/chooser_headline_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/chooser_edge_margin_normal"
-        android:layout_marginBottom="@dimen/chooser_view_spacing" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/java/res/layout/chooser_grid_preview_text.xml b/java/res/layout/chooser_grid_preview_text.xml
index f3045c34..ee54c0ae 100644
--- a/java/res/layout/chooser_grid_preview_text.xml
+++ b/java/res/layout/chooser_grid_preview_text.xml
@@ -27,14 +27,6 @@
     android:orientation="vertical"
     android:background="?androidprv:attr/materialColorSurfaceContainer">
 
-  <ViewStub
-      android:id="@+id/chooser_headline_row_stub"
-      android:layout="@layout/chooser_headline_row"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:paddingHorizontal="@dimen/chooser_edge_margin_normal"
-      android:layout_marginBottom="@dimen/chooser_view_spacing" />
-
   <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -122,4 +114,3 @@
   <include layout="@layout/chooser_action_row" />
 
 </LinearLayout>
-
diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 0d792b6d..9328baf5 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -1583,7 +1583,7 @@ public class ChooserActivity extends Hilt_ChooserActivity implements
                 getResources(),
                 getLayoutInflater(),
                 parent,
-                findViewById(R.id.chooser_headline_row_container));
+                requireViewById(R.id.chooser_headline_row_container));
 
         if (layout != null) {
             adjustPreviewWidth(getResources().getConfiguration().orientation, layout);
diff --git a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
index 4cb30341..4b955c49 100644
--- a/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUi.java
@@ -97,7 +97,6 @@ public final class ChooserContentPreviewUi {
     @VisibleForTesting
     final ContentPreviewUi mContentPreviewUi;
     private final Supplier</*@Nullable*/ActionRow.Action> mModifyShareActionFactory;
-    @Nullable
     private View mHeadlineParent;
 
     public ChooserContentPreviewUi(
@@ -226,15 +225,12 @@ public final class ChooserContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
 
         ViewGroup layout =
                 mContentPreviewUi.display(resources, layoutInflater, parent, headlineViewParent);
-        mHeadlineParent = headlineViewParent == null ? layout : headlineViewParent;
-        if (mHeadlineParent != null) {
-            ContentPreviewUi.displayModifyShareAction(
-                    mHeadlineParent, mModifyShareActionFactory.get());
-        }
+        mHeadlineParent = headlineViewParent;
+        ContentPreviewUi.displayModifyShareAction(mHeadlineParent, mModifyShareActionFactory.get());
         return layout;
     }
 
@@ -242,10 +238,7 @@ public final class ChooserContentPreviewUi {
      * Update Modify Share Action, if it is inflated.
      */
     public void updateModifyShareAction() {
-        if (mHeadlineParent != null) {
-            ContentPreviewUi.displayModifyShareAction(
-                    mHeadlineParent, mModifyShareActionFactory.get());
-        }
+        ContentPreviewUi.displayModifyShareAction(mHeadlineParent, mModifyShareActionFactory.get());
     }
 
     private static TextContentPreviewUi createTextPreview(
diff --git a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
index 71d5fc0b..8eaf3568 100644
--- a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
@@ -48,7 +48,7 @@ public abstract class ContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent);
+            View headlineViewParent);
 
     protected static void updateViewWithImage(ImageView imageView, Bitmap image) {
         if (image == null) {
diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
index d127d929..1749c6f7 100644
--- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
@@ -76,7 +76,7 @@ class FileContentPreviewUi extends ContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         return displayInternal(resources, layoutInflater, parent, headlineViewParent);
     }
 
@@ -84,12 +84,9 @@ class FileContentPreviewUi extends ContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         mContentPreview = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_file, parent, false);
-        if (headlineViewParent == null) {
-            headlineViewParent = mContentPreview;
-        }
         inflateHeadline(headlineViewParent);
 
         displayHeadline(headlineViewParent, mHeadlineGenerator.getFilesHeadline(mFileCount));
diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
index 0367e9d5..b50f5bc8 100644
--- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
@@ -108,7 +108,7 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         return displayInternal(layoutInflater, parent, headlineViewParent);
     }
 
@@ -133,10 +133,10 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
     private ViewGroup displayInternal(
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         mContentPreviewView = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_files_text, parent, false);
-        mHeadliveView = headlineViewParent == null ? mContentPreviewView : headlineViewParent;
+        mHeadliveView = headlineViewParent;
         inflateHeadline(mHeadliveView);
 
         final ActionRow actionRow =
diff --git a/java/src/com/android/intentresolver/contentpreview/NoContextPreviewUi.kt b/java/src/com/android/intentresolver/contentpreview/NoContextPreviewUi.kt
index 31a7006c..924e6499 100644
--- a/java/src/com/android/intentresolver/contentpreview/NoContextPreviewUi.kt
+++ b/java/src/com/android/intentresolver/contentpreview/NoContextPreviewUi.kt
@@ -29,7 +29,7 @@ internal class NoContextPreviewUi(private val type: Int) : ContentPreviewUi() {
         resources: Resources?,
         layoutInflater: LayoutInflater?,
         parent: ViewGroup?,
-        headlineViewParent: View?,
+        headlineViewParent: View,
     ): ViewGroup? {
         Log.e(TAG, "Unexpected content preview type: $type")
         return null
diff --git a/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt b/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt
index 5fce711c..57a51239 100644
--- a/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt
+++ b/java/src/com/android/intentresolver/contentpreview/ShareouselContentPreviewUi.kt
@@ -45,21 +45,17 @@ class ShareouselContentPreviewUi : ContentPreviewUi() {
         resources: Resources,
         layoutInflater: LayoutInflater,
         parent: ViewGroup,
-        headlineViewParent: View?,
+        headlineViewParent: View,
     ): ViewGroup = displayInternal(parent, headlineViewParent)
 
-    private fun displayInternal(parent: ViewGroup, headlineViewParent: View?): ViewGroup {
-        if (headlineViewParent != null) {
-            inflateHeadline(headlineViewParent)
-        }
+    private fun displayInternal(parent: ViewGroup, headlineViewParent: View): ViewGroup {
+        inflateHeadline(headlineViewParent)
         return ComposeView(parent.context).apply {
             setContent {
                 val vm: ChooserViewModel = viewModel()
                 val viewModel: ShareouselViewModel = vm.shareouselViewModel
 
-                headlineViewParent?.let {
-                    LaunchedEffect(viewModel) { bindHeader(viewModel, headlineViewParent) }
-                }
+                LaunchedEffect(viewModel) { bindHeader(viewModel, headlineViewParent) }
 
                 MaterialTheme(
                     colorScheme =
diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
index a7ae81b0..ae7ddcd9 100644
--- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
@@ -82,19 +82,16 @@ class TextContentPreviewUi extends ContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         return displayInternal(layoutInflater, parent, headlineViewParent);
     }
 
     private ViewGroup displayInternal(
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_text, parent, false);
-        if (headlineViewParent == null) {
-            headlineViewParent = contentPreviewLayout;
-        }
         inflateHeadline(headlineViewParent);
 
         final ActionRow actionRow =
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index 77252112..88311016 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -54,7 +54,6 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
     private List<FileInfo> mFiles;
     @Nullable
     private ViewGroup mContentPreviewView;
-    @Nullable
     private View mHeadlineView;
 
     UnifiedContentPreviewUi(
@@ -93,7 +92,7 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
             Resources resources,
             LayoutInflater layoutInflater,
             ViewGroup parent,
-            @Nullable View headlineViewParent) {
+            View headlineViewParent) {
         return displayInternal(layoutInflater, parent, headlineViewParent);
     }
 
@@ -109,10 +108,10 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
     }
 
     private ViewGroup displayInternal(
-            LayoutInflater layoutInflater, ViewGroup parent, @Nullable View headlineViewParent) {
+            LayoutInflater layoutInflater, ViewGroup parent, View headlineViewParent) {
         mContentPreviewView = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_image, parent, false);
-        mHeadlineView = headlineViewParent == null ? mContentPreviewView : headlineViewParent;
+        mHeadlineView = headlineViewParent;
         inflateHeadline(mHeadlineView);
 
         final ActionRow actionRow =