diff options
Diffstat (limited to 'java/src')
3 files changed, 5 insertions, 6 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java index 85f94451..13f27493 100644 --- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java @@ -22,6 +22,7 @@ import android.util.PluralsMessageFormatter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import com.android.intentresolver.R; @@ -91,6 +92,8 @@ class FileContentPreviewUi extends ContentPreviewUi { secondLine.setText( PluralsMessageFormatter.format(resources, arguments, R.string.more_files)); } else { + ImageView icon = contentPreviewLayout.findViewById(R.id.content_preview_file_icon); + icon.setImageResource(R.drawable.single_file); secondLine.setVisibility(View.GONE); } diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java index 363508b7..4fe54681 100644 --- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java @@ -181,7 +181,6 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi { includeText.setText(isLink ? R.string.include_link : R.string.include_text); shareTextAction.accept(false); includeText.setOnCheckedChangeListener((view, isChecked) -> { - textView.setEnabled(isChecked); if (isChecked) { textView.setText(mText); } else { diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java index c429b2d6..3c8a6e48 100644 --- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java @@ -79,9 +79,6 @@ class TextContentPreviewUi extends ContentPreviewUi { ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate( R.layout.chooser_grid_preview_text, parent, false); - boolean minimalPreview = - parent.getContext().getResources().getBoolean(R.bool.minimal_preview); - final ActionRow actionRow = contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row); actionRow.setActions( @@ -108,7 +105,7 @@ class TextContentPreviewUi extends ContentPreviewUi { TextView previewTitleView = contentPreviewLayout.findViewById( com.android.internal.R.id.content_preview_title); - if (TextUtils.isEmpty(mPreviewTitle) || minimalPreview) { + if (TextUtils.isEmpty(mPreviewTitle)) { previewTitleView.setVisibility(View.GONE); } else { previewTitleView.setText(mPreviewTitle); @@ -116,7 +113,7 @@ class TextContentPreviewUi extends ContentPreviewUi { ImageView previewThumbnailView = contentPreviewLayout.findViewById( com.android.internal.R.id.content_preview_thumbnail); - if (!isOwnedByCurrentUser(mPreviewThumbnail) || minimalPreview) { + if (!isOwnedByCurrentUser(mPreviewThumbnail)) { previewThumbnailView.setVisibility(View.GONE); } else { mImageLoader.loadImage( |