Replace view stubs with actual views

With the feature flags removed, there are no layout variations for
action row and image preivew anymore thus ViewStubs can be replaced with
the actual views.

Bug: 267355521
Bug: 266983432
Test: manual testing
Change-Id: I96a3a3560bfa5f1fbf064bd6080c618467c7aca1

4 files changed, 21 insertions, 56 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
index 15ba96c0..fcafe752 100644
--- a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
@@ -29,13 +29,10 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewStub;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.LayoutRes;
-
 import com.android.intentresolver.R;
 import com.android.intentresolver.widget.ActionRow;
 
@@ -52,19 +49,6 @@ abstract class ContentPreviewUi {
     public abstract ViewGroup display(
             Resources resources, LayoutInflater layoutInflater, ViewGroup parent);
 
-    protected static int getActionRowLayout() {
-        return R.layout.scrollable_chooser_action_row;
-    }
-
-    protected static ActionRow inflateActionRow(ViewGroup parent, @LayoutRes int actionRowLayout) {
-        final ViewStub stub = parent.findViewById(com.android.intentresolver.R.id.action_row_stub);
-        if (stub != null) {
-            stub.setLayoutResource(actionRowLayout);
-            stub.inflate();
-        }
-        return parent.findViewById(com.android.internal.R.id.chooser_action_row);
-    }
-
     protected static List<ActionRow.Action> createActions(
             List<ActionRow.Action> systemActions,
             List<ActionRow.Action> customActions) {
diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
index 3012eec2..e814eb12 100644
--- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
@@ -25,8 +25,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.LayoutRes;
-
 import com.android.intentresolver.ImageLoader;
 import com.android.intentresolver.R;
 import com.android.intentresolver.widget.ActionRow;
@@ -70,7 +68,6 @@ class FileContentPreviewUi extends ContentPreviewUi {
 
     private ViewGroup displayInternal(
             Resources resources, LayoutInflater layoutInflater, ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_file, parent, false);
 
@@ -110,13 +107,12 @@ class FileContentPreviewUi extends ContentPreviewUi {
             fileIconView.setImageResource(R.drawable.ic_file_copy);
         }
 
-        final ActionRow actionRow = inflateActionRow(contentPreviewLayout, actionRowLayout);
-        if (actionRow != null) {
-            actionRow.setActions(
-                    createActions(
-                            createFilePreviewActions(),
-                            mActionFactory.createCustomActions()));
-        }
+        final ActionRow actionRow =
+                contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
+        actionRow.setActions(
+                createActions(
+                        createFilePreviewActions(),
+                        mActionFactory.createCustomActions()));
 
         return contentPreviewLayout;
     }
diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
index 70df6479..ece0c312 100644
--- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
@@ -25,7 +25,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 
 import com.android.intentresolver.ImageLoader;
@@ -76,17 +75,15 @@ class TextContentPreviewUi extends ContentPreviewUi {
     private ViewGroup displayInternal(
             LayoutInflater layoutInflater,
             ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_text, parent, false);
 
-        final ActionRow actionRow = inflateActionRow(contentPreviewLayout, actionRowLayout);
-        if (actionRow != null) {
-            actionRow.setActions(
-                    createActions(
-                            createTextPreviewActions(),
-                            mActionFactory.createCustomActions()));
-        }
+        final ActionRow actionRow =
+                contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
+        actionRow.setActions(
+                createActions(
+                        createTextPreviewActions(),
+                        mActionFactory.createCustomActions()));
 
         if (mSharingText == null) {
             contentPreviewLayout
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index 00a11e30..748f7421 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -26,11 +26,9 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewStub;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
-import androidx.annotation.LayoutRes;
 import androidx.annotation.Nullable;
 
 import com.android.intentresolver.ImageLoader;
@@ -89,18 +87,17 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
     }
 
     private ViewGroup displayInternal(LayoutInflater layoutInflater, ViewGroup parent) {
-        @LayoutRes int actionRowLayout = getActionRowLayout();
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_image, parent, false);
-        ScrollableImagePreviewView imagePreview = inflateImagePreviewView(contentPreviewLayout);
-
-        final ActionRow actionRow = inflateActionRow(contentPreviewLayout, actionRowLayout);
-        if (actionRow != null) {
-            actionRow.setActions(
-                    createActions(
-                            createImagePreviewActions(),
-                            mActionFactory.createCustomActions()));
-        }
+        ScrollableImagePreviewView imagePreview =
+                contentPreviewLayout.findViewById(R.id.scrollable_image_preview);
+
+        final ActionRow actionRow =
+                contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
+        actionRow.setActions(
+                createActions(
+                        createImagePreviewActions(),
+                        mActionFactory.createCustomActions()));
 
         if (mFiles.size() == 0) {
             Log.i(
@@ -167,15 +164,6 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
         return actions;
     }
 
-    private ScrollableImagePreviewView inflateImagePreviewView(ViewGroup previewLayout) {
-        ViewStub stub = previewLayout.findViewById(R.id.image_preview_stub);
-        if (stub != null) {
-            stub.setLayoutResource(R.layout.scrollable_image_preview_view);
-            stub.inflate();
-        }
-        return previewLayout.findViewById(R.id.scrollable_image_preview);
-    }
-
     private void updateTextWithImageHeadline(ViewGroup contentPreview) {
         CheckBox actionView = contentPreview.requireViewById(R.id.include_text_action);
         if (actionView.getVisibility() == View.VISIBLE && actionView.isChecked()) {