summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
author 1 <mrcasey@google.com> 2023-03-28 15:28:00 +0000
committer 1 <mrcasey@google.com> 2023-03-28 16:37:07 +0000
commitdf5ea9d3683947c09c53c632d1e4822b31b88a88 (patch)
tree161bea1fa2318771a352e7fee48645706c0dbe5d /java/src
parent3fb79ddddd491d2960ebc90414b976345ef70a15 (diff)
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
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java6
1 files changed, 4 insertions, 2 deletions
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;
}