Merge "External storage provider, document picker UI." (037db6cf) · Commits · e / os / android_frameworks_base

core/java/android/provider/DocumentsContract.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.graphics.BitmapFactory;
		import android.graphics.Point;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.SystemClock;
		import android.util.Log;

		import libcore.io.IoUtils;
		@@ -52,6 +51,9 @@ public final class DocumentsContract {
		*/
		public static final String MIME_TYPE_DIRECTORY = "vnd.android.cursor.dir/doc";

		/** {@hide} */
		public static final String META_DATA_DOCUMENT_PROVIDER = "android.content.DOCUMENT_PROVIDER";

		/**
		* {@link DocumentColumns#GUID} value representing the root directory of a
		* storage backend.

packages/DocumentsUI/Android.mk

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_MODULE_TAGS := optional

		LOCAL_SRC_FILES := $(call all-subdir-java-files)

		LOCAL_PACKAGE_NAME := DocumentsUI
		LOCAL_CERTIFICATE := platform

		include $(BUILD_PACKAGE)

packages/DocumentsUI/AndroidManifest.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.documentsui">

		<uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />

		<application android:label="@string/app_label">
		<activity
		android:name=".DocumentsActivity"
		android:finishOnCloseSystemDialogs="true"
		android:excludeFromRecents="true">
		<intent-filter android:priority="100">
		<action android:name="android.intent.action.OPEN_DOCUMENT" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter android:priority="100">
		<action android:name="android.intent.action.CREATE_DOCUMENT" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>
		</application>
		</manifest>

packages/DocumentsUI/res/values/strings.xml

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2013 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<resources>
		<string name="app_label">Documents</string>
		</resources>

packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java

0 → 100644

+168 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.documentsui;

		import android.app.FragmentManager;
		import android.app.FragmentTransaction;
		import android.app.ListFragment;
		import android.app.LoaderManager.LoaderCallbacks;
		import android.content.Context;
		import android.content.CursorLoader;
		import android.content.Loader;
		import android.database.Cursor;
		import android.net.Uri;
		import android.os.Bundle;
		import android.provider.DocumentsContract;
		import android.provider.DocumentsContract.DocumentColumns;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.CursorAdapter;
		import android.widget.ImageView;
		import android.widget.ListView;
		import android.widget.TextView;

		public class DirectoryFragment extends ListFragment {
		private DocumentsAdapter mAdapter;
		private LoaderCallbacks<Cursor> mCallbacks;

		private static final String EXTRA_URI = "uri";

		private static final int LOADER_DOCUMENTS = 2;

		public static void show(FragmentManager fm, Uri uri, CharSequence title) {
		final Bundle args = new Bundle();
		args.putParcelable(EXTRA_URI, uri);

		final DirectoryFragment fragment = new DirectoryFragment();
		fragment.setArguments(args);

		final FragmentTransaction ft = fm.beginTransaction();
		ft.replace(android.R.id.content, fragment);
		ft.addToBackStack(title.toString());
		ft.setBreadCrumbTitle(title);
		ft.commitAllowingStateLoss();
		}

		@Override
		public View onCreateView(
		LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
		final Context context = inflater.getContext();

		mAdapter = new DocumentsAdapter(context);
		setListAdapter(mAdapter);

		mCallbacks = new LoaderCallbacks<Cursor>() {
		@Override
		public Loader<Cursor> onCreateLoader(int id, Bundle args) {
		final Uri uri = args.getParcelable(EXTRA_URI);
		return new CursorLoader(context, uri, null, null, null, null);
		}

		@Override
		public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
		mAdapter.swapCursor(data);
		}

		@Override
		public void onLoaderReset(Loader<Cursor> loader) {
		mAdapter.swapCursor(null);
		}
		};

		return super.onCreateView(inflater, container, savedInstanceState);
		}

		@Override
		public void onStart() {
		super.onStart();
		getLoaderManager().restartLoader(LOADER_DOCUMENTS, getArguments(), mCallbacks);
		}

		@Override
		public void onStop() {
		super.onStop();
		getLoaderManager().destroyLoader(LOADER_DOCUMENTS);
		}

		@Override
		public void onListItemClick(ListView l, View v, int position, long id) {
		final Cursor cursor = (Cursor) mAdapter.getItem(position);
		final String guid = getCursorString(cursor, DocumentColumns.GUID);
		final String mimeType = getCursorString(cursor, DocumentColumns.MIME_TYPE);

		final Uri uri = getArguments().getParcelable(EXTRA_URI);
		final Uri childUri = DocumentsContract.buildDocumentUri(uri.getAuthority(), guid);

		if (DocumentsContract.MIME_TYPE_DIRECTORY.equals(mimeType)) {
		// Nested directory picked, recurse using new fragment
		final Uri childContentsUri = DocumentsContract.buildContentsUri(childUri);
		final String displayName = cursor.getString(
		cursor.getColumnIndex(DocumentColumns.DISPLAY_NAME));
		DirectoryFragment.show(getFragmentManager(), childContentsUri, displayName);
		} else {
		// Explicit file picked, return
		((DocumentsActivity) getActivity()).onDocumentPicked(childUri);
		}
		}

		private class DocumentsAdapter extends CursorAdapter {
		public DocumentsAdapter(Context context) {
		super(context, null, false);
		}

		@Override
		public View newView(Context context, Cursor cursor, ViewGroup parent) {
		return LayoutInflater.from(context)
		.inflate(com.android.internal.R.layout.preference, parent, false);
		}

		@Override
		public void bindView(View view, Context context, Cursor cursor) {
		final TextView title = (TextView) view.findViewById(android.R.id.title);
		final TextView summary = (TextView) view.findViewById(android.R.id.summary);
		final ImageView icon = (ImageView) view.findViewById(android.R.id.icon);

		icon.setMaxWidth(128);
		icon.setMaxHeight(128);

		final String guid = getCursorString(cursor, DocumentColumns.GUID);
		final String displayName = getCursorString(cursor, DocumentColumns.DISPLAY_NAME);
		final String mimeType = getCursorString(cursor, DocumentColumns.MIME_TYPE);
		final int flags = getCursorInt(cursor, DocumentColumns.FLAGS);

		if ((flags & DocumentsContract.FLAG_SUPPORTS_THUMBNAIL) != 0) {
		final Uri uri = getArguments().getParcelable(EXTRA_URI);
		final Uri childUri = DocumentsContract.buildDocumentUri(uri.getAuthority(), guid);
		icon.setImageURI(childUri);
		} else {
		icon.setImageURI(null);
		}

		title.setText(displayName);
		summary.setText(mimeType);
		}
		}

		private static String getCursorString(Cursor cursor, String columnName) {
		return cursor.getString(cursor.getColumnIndex(columnName));
		}

		private static int getCursorInt(Cursor cursor, String columnName) {
		return cursor.getInt(cursor.getColumnIndex(columnName));
		}
		}