From 09c07bdf3772d919c5910cccae7806c583fb82a3 Mon Sep 17 00:00:00 2001 From: Aga Wronska Date: Thu, 10 Mar 2016 11:06:47 -0800 Subject: [PATCH] Display file names in Media libraries in grid mode Bug: 26829518 Change-Id: If9e2f331df0233ef114c4147ffbc16214558b5ce --- core/java/android/provider/DocumentsContract.java | 12 ------------ .../documentsui/dirlist/DirectoryFragment.java | 10 ---------- .../documentsui/dirlist/GridDocumentHolder.java | 8 -------- .../com/android/documentsui/model/DocumentInfo.java | 4 ---- 4 files changed, 34 deletions(-) diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 0065cd961eb2f..d27131c269a9e 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -383,18 +383,6 @@ public final class DocumentsContract { */ public static final int FLAG_ARCHIVE = 1 << 15; - /** - * Flag indicating that document titles should be hidden when viewing - * this directory in a larger format grid. For example, a directory - * containing only images may want the image thumbnails to speak for - * themselves. Only valid when {@link #COLUMN_MIME_TYPE} is - * {@link #MIME_TYPE_DIR}. - * - * @see #COLUMN_FLAGS - * @see #FLAG_DIR_PREFERS_GRID - * @hide - */ - public static final int FLAG_DIR_HIDE_GRID_TITLES = 1 << 16; } /** diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index ca1b444b3531b..461bade4ae832 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -281,16 +281,6 @@ public class DirectoryFragment extends Fragment mTuner = FragmentTuner.pick(getContext(), state); mClipper = new DocumentClipper(context); - boolean hideGridTitles; - if (mType == TYPE_RECENT_OPEN) { - // Hide titles when showing recents for picking images/videos - hideGridTitles = MimePredicate.mimeMatches( - MimePredicate.VISUAL_MIMES, state.acceptMimes); - } else { - hideGridTitles = (mDocument != null) && mDocument.isGridTitlesHidden(); - } - GridDocumentHolder.setHideTitles(hideGridTitles); - final ActivityManager am = (ActivityManager) context.getSystemService( Context.ACTIVITY_SERVICE); boolean svelte = am.isLowRamDevice() && (mType == TYPE_RECENT_OPEN); diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java index e7fa28b258370..c8641a8000f53 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/GridDocumentHolder.java @@ -150,12 +150,4 @@ final class GridDocumentHolder extends DocumentHolder { mSize.setText(Formatter.formatFileSize(mContext, docSize)); } } - - /** - * Sets whether to hide titles on subsequently created GridDocumentHolder items. - * @param hideTitles - */ - public static void setHideTitles(boolean hideTitles) { - mHideTitles = hideTitles; - } } diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java index d74121e536bd9..d5327f916beda 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java @@ -245,10 +245,6 @@ public class DocumentInfo implements Durable, Parcelable { return (flags & Document.FLAG_SUPPORTS_RENAME) != 0; } - public boolean isGridTitlesHidden() { - return (flags & Document.FLAG_DIR_HIDE_GRID_TITLES) != 0; - } - public boolean isArchive() { return (flags & Document.FLAG_ARCHIVE) != 0; }