CMFileManager: Add mimetype to search result. (58395bbe) · Commits · e / os / android_packages_apps_CMFileManager

res/layout/search_item.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,15 @@
		android:layout_marginLeft="@dimen/default_margin"
		android:layout_marginRight="@dimen/default_margin" />

		<TextView
		android:id="@+id/search_item_mime_type"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="left\|center_vertical"
		android:singleLine="true"
		android:layout_marginRight="3dp"
		android:textAppearance="@style/secondary_text_appearance" />

		<TextView
		android:id="@+id/search_item_parent_dir"
		android:layout_width="wrap_content"

src/com/cyanogenmod/filemanager/adapters/SearchResultAdapter.java

+20 −10

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		TextView mTvName;
		TextView mTvParentDir;
		RelevanceView mWgRelevance;
		TextView mMimeType;
		}

		/**
		@@ -78,6 +79,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		CharSequence mName;
		String mParentDir;
		Float mRelevance;
		MimeTypeHelper.MimeTypeCategory mimeTypeCategory;
		}

		private DataHolder[] mData;
		@@ -99,6 +101,8 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		private static final int RESOURCE_ITEM_PARENT_DIR = R.id.search_item_parent_dir;
		//The resource of the item relevance
		private static final int RESOURCE_ITEM_RELEVANCE = R.id.search_item_relevance;
		//The resource of the item mime type
		private static final int RESOURCE_ITEM_MIME_TYPE = R.id.search_item_mime_type;

		/**
		* Constructor of <code>SearchResultAdapter</code>.
		@@ -201,6 +205,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		} else {
		this.mData[i].mRelevance = null;
		}
		this.mData[i].mimeTypeCategory = MimeTypeHelper.getCategory(getContext(), fso);
		}
		}

		@@ -243,6 +248,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {

		//Check to reuse view
		View v = convertView;

		if (v == null) {
		//Create the view holder
		LayoutInflater li =
		@@ -253,7 +259,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		viewHolder.mTvName = (TextView) v.findViewById(RESOURCE_ITEM_NAME);
		viewHolder.mTvParentDir = (TextView) v.findViewById(RESOURCE_ITEM_PARENT_DIR);
		viewHolder.mWgRelevance = (RelevanceView) v.findViewById(RESOURCE_ITEM_RELEVANCE);
		v.setTag(viewHolder);
		viewHolder.mMimeType = (TextView) v.findViewById(RESOURCE_ITEM_MIME_TYPE);

		// Apply the current theme
		Theme theme = ThemeManager.getCurrentTheme(getContext());
		@@ -263,6 +269,7 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		theme.setTextColor(
		getContext(), viewHolder.mTvParentDir, "text_color"); //$NON-NLS-1$
		}
		v.setTag(viewHolder);
		}

		//Retrieve data holder
		@@ -272,7 +279,6 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		ViewHolder viewHolder = (ViewHolder) v.getTag();

		//Set the data

		if (convertView != null) {
		mIconHolder.cancelLoad(viewHolder.mIvIcon);
		}
		@@ -286,9 +292,13 @@ public class SearchResultAdapter extends ArrayAdapter<SearchResult> {
		}
		viewHolder.mWgRelevance.setVisibility(
		dataHolder.mRelevance != null ? View.VISIBLE : View.GONE);

		if (dataHolder.mimeTypeCategory != MimeTypeHelper.MimeTypeCategory.NONE) {
		viewHolder.mMimeType.setVisibility(View.VISIBLE);
		viewHolder.mMimeType.setText(dataHolder.mimeTypeCategory.name());
		} else {
		viewHolder.mMimeType.setVisibility(View.GONE);
		}
		//Return the view
		return v;
		}

		}