From df5ea9d3683947c09c53c632d1e4822b31b88a88 Mon Sep 17 00:00:00 2001
From: 1 <mrcasey@google.com>
Date: Tue, 28 Mar 2023 15:28:00 +0000
Subject: Hide all system actions if there are custom actions.

Nearby will have a separate home for launch, the others are
intentionally hidden per product feedback.

Bug: 274645844
Test: atest ContentPreviewUiTest
Test: atest CtsSharesheetDeviceTest
Change-Id: I5cd9157bc3ab6fd38a9993e470604633fd41c7e2
---
 .../com/android/intentresolver/contentpreview/ContentPreviewUi.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'java/src')

diff --git a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
index a6bc2164..2a6bff5c 100644
--- a/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java
@@ -75,9 +75,11 @@ abstract class ContentPreviewUi {
             FeatureFlagRepository featureFlagRepository) {
         ArrayList<ActionRow.Action> actions =
                 new ArrayList<>(systemActions.size() + customActions.size());
-        actions.addAll(systemActions);
-        if (featureFlagRepository.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)) {
+        if (featureFlagRepository.isEnabled(Flags.SHARESHEET_CUSTOM_ACTIONS)
+                && customActions != null && !customActions.isEmpty()) {
             actions.addAll(customActions);
+        } else {
+            actions.addAll(systemActions);
         }
         return actions;
     }
-- 
cgit v1.2.3-59-g8ed1b