diff options
Diffstat (limited to 'java')
4 files changed, 22 insertions, 8 deletions
diff --git a/java/res/layout/chooser_action_row.xml b/java/res/layout/chooser_action_row.xml index f77b0e68..61d36b12 100644 --- a/java/res/layout/chooser_action_row.xml +++ b/java/res/layout/chooser_action_row.xml @@ -20,6 +20,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <View + android:id="@+id/actions_top_divider" android:layout_width="match_parent" android:layout_height="2dp" android:background="?androidprv:attr/materialColorSurfaceContainer" diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java index e43ab6d3..85f94451 100644 --- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java @@ -96,8 +96,12 @@ class FileContentPreviewUi extends ContentPreviewUi { final ActionRow actionRow = contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row); - actionRow.setActions( - createActions(new ArrayList<>(), mActionFactory.createCustomActions())); + List<ActionRow.Action> actions = + createActions(new ArrayList<>(), mActionFactory.createCustomActions()); + actionRow.setActions(actions); + if (actions.isEmpty()) { + contentPreviewLayout.findViewById(R.id.actions_top_divider).setVisibility(View.GONE); + } return contentPreviewLayout; } diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java index 12843e0a..d6da4a49 100644 --- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java @@ -98,9 +98,14 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi { final ActionRow actionRow = contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row); - actionRow.setActions(createActions( + List<ActionRow.Action> actions = createActions( createImagePreviewActions(), - mActionFactory.createCustomActions())); + mActionFactory.createCustomActions()); + actionRow.setActions(actions); + + if (actions.isEmpty()) { + contentPreviewLayout.findViewById(R.id.actions_top_divider).setVisibility(View.GONE); + } if (shouldShowPreview()) { mImageLoader.loadImage(mFiles.get(0).getPreviewUri(), bitmap -> { diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java index 8d3e6031..d8e2088b 100644 --- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java @@ -85,10 +85,14 @@ class UnifiedContentPreviewUi extends ContentPreviewUi { final ActionRow actionRow = contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row); - actionRow.setActions( - createActions( - createImagePreviewActions(), - mActionFactory.createCustomActions())); + List<ActionRow.Action> actions = createActions( + createImagePreviewActions(), + mActionFactory.createCustomActions()); + actionRow.setActions(actions); + if (actions.isEmpty()) { + contentPreviewLayout.findViewById(R.id.actions_top_divider).setVisibility(View.GONE); + } + if (mFiles.size() == 0) { Log.i( |