Merge "Display file names in Media libraries in grid mode" into nyc-dev
am: 8800f2d314
* commit '8800f2d314793b3a97d27b96c0d2faef9e2efbd1':
Display file names in Media libraries in grid mode
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java
index bec1af0..e7a9b7d 100644
--- a/core/java/android/provider/DocumentsContract.java
+++ b/core/java/android/provider/DocumentsContract.java
@@ -381,18 +381,6 @@
*/
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 ca1b444..461bade 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 @@
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 e7fa28b..c8641a8 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 @@
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 d74121e..d5327f9 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 @@
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;
}