Merge "Storage roots in fragment, sectioned." (b3316ef7) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -20324,6 +20324,7 @@ package android.provider {
		field public static final java.lang.String FLAGS = "flags";
		field public static final java.lang.String LAST_MODIFIED = "last_modified";
		field public static final java.lang.String MIME_TYPE = "mime_type";
		field public static final java.lang.String SUMMARY = "summary";
		}

		public static abstract interface DocumentsContract.RootColumns {

+32 −0

Original line number	Diff line number	Diff line
		@@ -267,11 +267,43 @@ public final class DocumentsContract {
		* Type: INTEGER (int)
		*/
		public static final String FLAGS = "flags";

		/**
		* Summary for this document, or {@code null} to omit.
		* <p>
		* Type: STRING
		*/
		public static final String SUMMARY = "summary";
		}

		/**
		* Root that represents a cloud-based storage service.
		*
		* @see RootColumns#ROOT_TYPE
		*/
		public static final int ROOT_TYPE_SERVICE = 1;

		/**
		* Root that represents a shortcut to content that may be available
		* elsewhere through another storage root.
		*
		* @see RootColumns#ROOT_TYPE
		*/
		public static final int ROOT_TYPE_SHORTCUT = 2;

		/**
		* Root that represents a physical storage device.
		*
		* @see RootColumns#ROOT_TYPE
		*/
		public static final int ROOT_TYPE_DEVICE = 3;

		/**
		* Root that represents a physical storage device that should only be
		* displayed to advanced users.
		*
		* @see RootColumns#ROOT_TYPE
		*/
		public static final int ROOT_TYPE_DEVICE_ADVANCED = 4;

		/**

+4 −4

Original line number	Diff line number	Diff line
		@@ -25,20 +25,20 @@
		android:orientation="vertical">

		<FrameLayout
		android:id="@+id/directory"
		android:id="@+id/container_directory"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1" />

		<FrameLayout
		android:id="@+id/save"
		android:id="@+id/container_save"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		</LinearLayout>

		<ListView
		android:id="@+id/roots_list"
		<FrameLayout
		android:id="@+id/container_roots"
		android:layout_width="250dp"
		android:layout_height="match_parent"
		android:layout_gravity="start"

0 → 100644

+20 −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.
		-->

		<ListView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/list"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

0 → 100644

+29 −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.
		-->

		<TextView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@android:id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:paddingTop="8dp"
		android:paddingBottom="8dp"
		android:singleLine="true"
		android:ellipsize="marquee"
		android:textAllCaps="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAlignment="viewStart" />