diff options
| author | 2023-03-28 21:15:10 +0000 | |
|---|---|---|
| committer | 2023-03-28 21:15:10 +0000 | |
| commit | 16ba54be45b006fa885430efffb42e7b50402a07 (patch) | |
| tree | 49c873a8471594703aced36938b38b729cf79e57 /java/src | |
| parent | 0937277c6dda178f1bbb63c6fff74f2b6329d67a (diff) | |
| parent | f89f1c98a5d77a29bab24cc76db6680b60b771db (diff) | |
Merge "Hide all system actions if there are custom actions." into udc-dev am: 35828ea4af am: f89f1c98a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22314884
Change-Id: Id7a0e74417eda8fa2042912aa57d3e4da522581c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/contentpreview/ContentPreviewUi.java | 6 |
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; } |