am 72bd0620: Merge "Settings, replace files, sorting by size, tweaks." (9a1237b5) · Commits · e / os / android_frameworks_base

core/java/android/provider/DocumentsContract.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -105,6 +105,8 @@ public final class DocumentsContract {
	*/		*/
	public static final int FLAG_SUPPORTS_SEARCH = 1 << 4;		public static final int FLAG_SUPPORTS_SEARCH = 1 << 4;

			// TODO: flag indicating that document is writable?

	/**		/**
	* Optimal dimensions for a document thumbnail request, stored as a		* Optimal dimensions for a document thumbnail request, stored as a
	* {@link Point} object. This is only a hint, and the returned thumbnail may		* {@link Point} object. This is only a hint, and the returned thumbnail may

packages/DocumentsUI/AndroidManifest.xml

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,11 +7,13 @@
	android:label="@string/app_label"		android:label="@string/app_label"
	android:supportsRtl="true">		android:supportsRtl="true">

			<!-- TODO: allow rotation when state saving is in better shape -->
	<activity		<activity
	android:name=".DocumentsActivity"		android:name=".DocumentsActivity"
	android:finishOnCloseSystemDialogs="true"		android:finishOnCloseSystemDialogs="true"
	android:excludeFromRecents="true"		android:excludeFromRecents="true"
	android:theme="@android:style/Theme.Holo.Light">		android:theme="@android:style/Theme.Holo.Light"
			android:screenOrientation="nosensor">
	<intent-filter android:priority="100">		<intent-filter android:priority="100">
	<action android:name="android.intent.action.OPEN_DOCUMENT" />		<action android:name="android.intent.action.OPEN_DOCUMENT" />
	<category android:name="android.intent.category.DEFAULT" />		<category android:name="android.intent.category.DEFAULT" />
	@@ -24,6 +26,12 @@
	</intent-filter>		</intent-filter>
	</activity>		</activity>

			<activity
			android:name=".SettingsActivity"
			android:title="@string/menu_settings"
			android:theme="@android:style/Theme.Holo.Light"
			android:exported="false" />

	<provider		<provider
	android:name=".RecentsProvider"		android:name=".RecentsProvider"
	android:authorities="com.android.documentsui.recents"		android:authorities="com.android.documentsui.recents"

packages/DocumentsUI/res/layout/fragment_directory.xml

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,15 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="match_parent">		android:layout_height="match_parent">

			<TextView
			android:id="@android:id/empty"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:gravity="center"
			android:text="@string/empty"
			android:textAppearance="?android:attr/textAppearanceMedium"
			android:visibility="gone" />

	<ListView		<ListView
	android:id="@+id/list"		android:id="@+id/list"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	@@ -30,6 +39,7 @@
	android:layout_height="match_parent"		android:layout_height="match_parent"
	android:listSelector="@android:color/transparent"		android:listSelector="@android:color/transparent"
	android:paddingTop="?android:attr/listPreferredItemPaddingStart"		android:paddingTop="?android:attr/listPreferredItemPaddingStart"
	android:paddingStart="?android:attr/listPreferredItemPaddingStart" />		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
			android:visibility="gone" />

	</FrameLayout>		</FrameLayout>

packages/DocumentsUI/res/layout/fragment_save.xml

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,8 @@
	android:layout_width="0dip"		android:layout_width="0dip"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:layout_weight="1"
	android:singleLine="true" />		android:singleLine="true"
			android:selectAllOnFocus="true" />

	<Button		<Button
	android:id="@android:id/button1"		android:id="@android:id/button1"

packages/DocumentsUI/res/layout/item_doc_grid.xml

+17 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="160dip"		android:layout_height="180dip"
	android:paddingBottom="?android:attr/listPreferredItemPaddingEnd"		android:paddingBottom="?android:attr/listPreferredItemPaddingEnd"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

	@@ -30,6 +30,7 @@
	<LinearLayout		<LinearLayout
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="match_parent"		android:layout_height="match_parent"
			android:paddingBottom="6dp"
	android:orientation="vertical">		android:orientation="vertical">

	<ImageView		<ImageView
	@@ -54,10 +55,10 @@
	android:textAlignment="viewStart" />		android:textAlignment="viewStart" />

	<LinearLayout		<LinearLayout
			android:id="@+id/summary_grid"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:orientation="horizontal"		android:orientation="horizontal"
	android:paddingBottom="6dp"
	android:paddingStart="?android:attr/listPreferredItemPaddingStart"		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

	@@ -75,12 +76,25 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:layout_weight="1"
	android:layout_gravity="center_vertical"		android:layout_gravity="center_vertical"
	android:layout_marginEnd="8dp"
	android:singleLine="true"		android:singleLine="true"
	android:ellipsize="marquee"		android:ellipsize="marquee"
	android:textAlignment="viewStart"		android:textAlignment="viewStart"
	android:textAppearance="?android:attr/textAppearanceSmall" />		android:textAppearance="?android:attr/textAppearanceSmall" />

			</LinearLayout>

			<LinearLayout
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:orientation="horizontal"
			android:paddingStart="?android:attr/listPreferredItemPaddingStart"
			android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

			<View
			android:layout_width="0dip"
			android:layout_height="0dip"
			android:layout_weight="1" />

	<TextView		<TextView
	android:id="@+id/size"		android:id="@+id/size"
	android:layout_width="70dp"		android:layout_width="70dp"