Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9072be13 authored Mar 11, 2016 by Aga Wronska Committed by Android (Google) Code Review Mar 11, 2016

Merge "Display file names in Media libraries in grid mode" into nyc-dev

parents e580b1f9 8a7a143c

src/com/android/documentsui/dirlist/DirectoryFragment.java

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -281,16 +281,6 @@ public class DirectoryFragment extends Fragment
	mTuner = FragmentTuner.pick(getContext(), state);		mTuner = FragmentTuner.pick(getContext(), state);
	mClipper = new DocumentClipper(context);		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(		final ActivityManager am = (ActivityManager) context.getSystemService(
	Context.ACTIVITY_SERVICE);		Context.ACTIVITY_SERVICE);
	boolean svelte = am.isLowRamDevice() && (mType == TYPE_RECENT_OPEN);		boolean svelte = am.isLowRamDevice() && (mType == TYPE_RECENT_OPEN);

src/com/android/documentsui/dirlist/GridDocumentHolder.java

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -150,12 +150,4 @@ final class GridDocumentHolder extends DocumentHolder {
	mSize.setText(Formatter.formatFileSize(mContext, docSize));		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;
	}
	}		}

src/com/android/documentsui/model/DocumentInfo.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -245,10 +245,6 @@ public class DocumentInfo implements Durable, Parcelable {
	return (flags & Document.FLAG_SUPPORTS_RENAME) != 0;		return (flags & Document.FLAG_SUPPORTS_RENAME) != 0;
	}		}

	public boolean isGridTitlesHidden() {
	return (flags & Document.FLAG_DIR_HIDE_GRID_TITLES) != 0;
	}

	public boolean isArchive() {		public boolean isArchive() {
	return (flags & Document.FLAG_ARCHIVE) != 0;		return (flags & Document.FLAG_ARCHIVE) != 0;
	}		}