diff --git a/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml b/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml deleted file mode 100644 index bf19d4e111a0a..0000000000000 --- a/packages/DocumentsUI/res/color/item_doc_grid_overlay.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_selection_check.png b/packages/DocumentsUI/res/drawable-hdpi/ic_grid_selection_check.png deleted file mode 100644 index f3007c288b387..0000000000000 Binary files a/packages/DocumentsUI/res/drawable-hdpi/ic_grid_selection_check.png and /dev/null differ diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_selection_check.png b/packages/DocumentsUI/res/drawable-mdpi/ic_grid_selection_check.png deleted file mode 100644 index 16f2ab9a5f06a..0000000000000 Binary files a/packages/DocumentsUI/res/drawable-mdpi/ic_grid_selection_check.png and /dev/null differ diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_selection_check.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_selection_check.png deleted file mode 100644 index 08853207e8757..0000000000000 Binary files a/packages/DocumentsUI/res/drawable-xhdpi/ic_grid_selection_check.png and /dev/null differ diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_selection_check.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_selection_check.png deleted file mode 100644 index 083bbcc3751b8..0000000000000 Binary files a/packages/DocumentsUI/res/drawable-xxhdpi/ic_grid_selection_check.png and /dev/null differ diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_grid_selection_check.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_grid_selection_check.png deleted file mode 100644 index 74b1ca517a94c..0000000000000 Binary files a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_grid_selection_check.png and /dev/null differ diff --git a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml deleted file mode 100644 index 3f50fb9f19f7c..0000000000000 --- a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay_icon.xml b/packages/DocumentsUI/res/drawable/item_doc_grid_overlay_icon.xml deleted file mode 100644 index d40de1e1512d0..0000000000000 --- a/packages/DocumentsUI/res/drawable/item_doc_grid_overlay_icon.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/packages/DocumentsUI/res/layout/item_doc_grid.xml b/packages/DocumentsUI/res/layout/item_doc_grid.xml index 15b12ce5297f2..1dfb34a9b19bb 100644 --- a/packages/DocumentsUI/res/layout/item_doc_grid.xml +++ b/packages/DocumentsUI/res/layout/item_doc_grid.xml @@ -14,132 +14,110 @@ limitations under the License. --> - - + - - - + android:layout_height="wrap_content" + android:paddingBottom="8dp"> + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + diff --git a/packages/DocumentsUI/res/values/colors.xml b/packages/DocumentsUI/res/values/colors.xml index a376418e01c2c..68c8b65c4f876 100644 --- a/packages/DocumentsUI/res/values/colors.xml +++ b/packages/DocumentsUI/res/values/colors.xml @@ -24,7 +24,7 @@ @*android:color/material_grey_300 @android:color/white - #88000000 + @android:color/white #88ffffff #44000000 diff --git a/packages/DocumentsUI/src/com/android/documentsui/GridItem.java b/packages/DocumentsUI/src/com/android/documentsui/GridItemThumbnail.java similarity index 80% rename from packages/DocumentsUI/src/com/android/documentsui/GridItem.java rename to packages/DocumentsUI/src/com/android/documentsui/GridItemThumbnail.java index 990dca70f9c6c..38d6d725c1598 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/GridItem.java +++ b/packages/DocumentsUI/src/com/android/documentsui/GridItemThumbnail.java @@ -18,22 +18,21 @@ package com.android.documentsui; import android.content.Context; import android.util.AttributeSet; -import android.widget.FrameLayout; +import android.widget.ImageView; /** - * A FrameLayout subclass used by DirectoryFragment. Ensures that the resulting grid item is always - * square. + * Ensures that grid thumbnails are always square. */ -public class GridItem extends FrameLayout { - public GridItem(Context context) { +public class GridItemThumbnail extends ImageView { + public GridItemThumbnail(Context context) { super(context); } - public GridItem(Context context, AttributeSet attrs) { + public GridItemThumbnail(Context context, AttributeSet attrs) { super(context, attrs); } - public GridItem(Context context, AttributeSet attrs, int defStyle) { + public GridItemThumbnail(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index b95c001e41378..21420c873ecc6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -1080,14 +1080,12 @@ public class DirectoryFragment extends Fragment { holder.setSelected(isSelected(position)); - final View line1 = itemView.findViewById(R.id.line1); final View line2 = itemView.findViewById(R.id.line2); final ImageView iconMime = (ImageView) itemView.findViewById(R.id.icon_mime); final ImageView iconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb); final TextView title = (TextView) itemView.findViewById(android.R.id.title); final ImageView icon1 = (ImageView) itemView.findViewById(android.R.id.icon1); - final ImageView icon2 = (ImageView) itemView.findViewById(android.R.id.icon2); final TextView summary = (TextView) itemView.findViewById(android.R.id.summary); final TextView date = (TextView) itemView.findViewById(R.id.date); final TextView size = (TextView) itemView.findViewById(R.id.size); @@ -1140,13 +1138,14 @@ public class DirectoryFragment extends Fragment { getDocumentIcon(mContext, docAuthority, docId, docMimeType, docIcon, state)); } - boolean hasLine1 = false; boolean hasLine2 = false; final boolean hideTitle = (state.derivedMode == MODE_GRID) && mHideGridTitles; if (!hideTitle) { title.setText(docDisplayName); - hasLine1 = true; + title.setVisibility(View.VISIBLE); + } else { + title.setVisibility(View.GONE); } Drawable iconDrawable = null; @@ -1154,11 +1153,7 @@ public class DirectoryFragment extends Fragment { // We've already had to enumerate roots before any results can // be shown, so this will never block. final RootInfo root = roots.getRootBlocking(docAuthority, docRootId); - if (state.derivedMode == MODE_GRID) { - iconDrawable = root.loadGridIcon(mContext); - } else { - iconDrawable = root.loadIcon(mContext); - } + iconDrawable = root.loadIcon(mContext); if (summary != null) { final boolean alwaysShowSummary = getResources() @@ -1200,16 +1195,10 @@ public class DirectoryFragment extends Fragment { } if (icon1 != null) icon1.setVisibility(View.GONE); - if (icon2 != null) icon2.setVisibility(View.GONE); if (iconDrawable != null) { - if (hasLine1) { - icon1.setVisibility(View.VISIBLE); - icon1.setImageDrawable(iconDrawable); - } else { - icon2.setVisibility(View.VISIBLE); - icon2.setImageDrawable(iconDrawable); - } + icon1.setVisibility(View.VISIBLE); + icon1.setImageDrawable(iconDrawable); } if (docLastModified == -1) { @@ -1231,9 +1220,6 @@ public class DirectoryFragment extends Fragment { size.setVisibility(View.GONE); } - if (line1 != null) { - line1.setVisibility(hasLine1 ? View.VISIBLE : View.GONE); - } if (line2 != null) { line2.setVisibility(hasLine2 ? View.VISIBLE : View.GONE); } @@ -1243,7 +1229,6 @@ public class DirectoryFragment extends Fragment { iconMime.setAlpha(iconAlpha); iconThumb.setAlpha(iconAlpha); if (icon1 != null) icon1.setAlpha(iconAlpha); - if (icon2 != null) icon2.setAlpha(iconAlpha); if (DEBUG_ENABLE_DND) { setupDragAndDropOnDocumentView(itemView, cursor); diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index 501392ca93f59..723700ded6c6d 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -249,15 +249,6 @@ public class RootInfo implements Durable, Parcelable { } } - public Drawable loadGridIcon(Context context) { - if (derivedIcon != 0) { - return IconUtils.applyTintAttr(context, derivedIcon, - android.R.attr.textColorPrimaryInverse); - } else { - return IconUtils.loadPackageIcon(context, authority, icon); - } - } - public Drawable loadToolbarIcon(Context context) { if (derivedIcon != 0) { return IconUtils.applyTintAttr(context, derivedIcon,