diff options
| author | 2023-03-28 21:11:22 +0000 | |
|---|---|---|
| committer | 2023-03-28 21:11:22 +0000 | |
| commit | f89f1c98a5d77a29bab24cc76db6680b60b771db (patch) | |
| tree | 4ea7f02efbdeb2a6d48dcd492758e74610a9422f /java/src | |
| parent | a703bf08aa2212ca0dbefd535e9df92075d20cf4 (diff) | |
| parent | 35828ea4afb4e23fa47c3c6e7c5772c0e59b15ea (diff) | |
Merge "Hide all system actions if there are custom actions." into udc-dev am: 35828ea4af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22314884
Change-Id: Id92703f24d30331c6f9210cd2a06460acaf18fdf
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; } |