summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMatt Pietal <mpietal@google.com>2019-04-05 13:20:31 -0400
committerMatt Pietal <mpietal@google.com>2019-04-05 13:38:06 -0400
commit832cdbf3742cf0da6059d2e4a4bf1a77b723a149 (patch)
tree28d3b11ff8abcbf97af0cfbc6bf37d3e9cb401a8 /core/java
parente0283ded0a7b2a2010f614943f939e1adc81ebeb (diff)
Sharesheet - Content preview polish
1. Add ripple feedback to clipboard copy even though the sharesheet disappears really fast and you may not see it. 2. Make sure file icon is gray and not influence by the overlay. 3. Default multiple file sharing to file preview area and not image preview area when there are mixed file types Bug: 129979196 Test: Visual inspection Change-Id: Ia86d418ccaca9a122f00dbc3e9c3b30785fb2abd
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 8d7df4f4ca85..6efd430c039b 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -785,7 +785,7 @@ public class ChooserActivity extends ResolverActivity {
} else {
ImageView fileIconView = parent.findViewById(R.id.content_preview_file_icon);
fileIconView.setVisibility(View.VISIBLE);
- fileIconView.setImageResource(R.drawable.ic_doc_generic);
+ fileIconView.setImageResource(R.drawable.chooser_file_generic);
}
}
@@ -834,12 +834,14 @@ public class ChooserActivity extends ResolverActivity {
}
for (Uri uri : uris) {
- if (findPreferredContentPreview(uri, resolver) == CONTENT_PREVIEW_IMAGE) {
- return CONTENT_PREVIEW_IMAGE;
+ // Defaulting to file preview when there are mixed image/file types is
+ // preferable, as it shows the user the correct number of items being shared
+ if (findPreferredContentPreview(uri, resolver) == CONTENT_PREVIEW_FILE) {
+ return CONTENT_PREVIEW_FILE;
}
}
- return CONTENT_PREVIEW_FILE;
+ return CONTENT_PREVIEW_IMAGE;
}
return CONTENT_PREVIEW_TEXT;