Merge "Refactor DocsUI to break out a new ManageRootActivity." (874062e3) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/AndroidManifest.xml

+8 −2

Original line number	Diff line number	Diff line
		@@ -36,12 +36,18 @@
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<intent-filter>
		<action android:name="android.provider.action.MANAGE_ROOT" />
		<action android:name="android.provider.action.BROWSE_DOCUMENT_ROOT" />
		<category android:name="android.intent.category.DEFAULT" />
		<data android:mimeType="vnd.android.document/root" />
		</intent-filter>
		</activity>

		<activity
		android:name=".ManageRootActivity"
		android:theme="@style/DocumentsNonDialogTheme"
		android:icon="@drawable/ic_doc_text">
		<intent-filter>
		<action android:name="android.provider.action.BROWSE_DOCUMENT_ROOT" />
		<action android:name="android.provider.action.MANAGE_ROOT" />
		<category android:name="android.intent.category.DEFAULT" />
		<data android:mimeType="vnd.android.document/root" />
		</intent-filter>

0 → 100644

+34 −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.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<com.android.documentsui.DirectoryContainerView
		android:id="@+id/container_directory"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<FrameLayout
		android:id="@+id/container_save"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/material_grey_50"
		android:elevation="8dp" />

		</LinearLayout>

+5 −14

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@
		android:layout_height="?android:attr/actionBarSize"
		android:background="?android:attr/colorPrimary"
		android:elevation="8dp"
		android:theme="?android:attr/actionBarTheme">
		android:theme="?actionBarTheme"
		android:popupTheme="?actionBarPopupTheme">

		<Spinner
		android:id="@+id/stack"
		@@ -41,18 +42,7 @@

		</com.android.documentsui.DocumentsToolBar>

		<com.android.documentsui.DirectoryContainerView
		android:id="@+id/container_directory"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<FrameLayout
		android:id="@+id/container_save"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/material_grey_50"
		android:elevation="8dp" />
		<include layout="@layout/directory_cluster"/>

		</LinearLayout>

		@@ -71,7 +61,8 @@
		android:layout_height="?android:attr/actionBarSize"
		android:background="?android:attr/colorPrimary"
		android:elevation="8dp"
		android:theme="?android:attr/actionBarTheme" />
		android:theme="?actionBarTheme"
		android:popupTheme="?actionBarPopupTheme" />

		<FrameLayout
		android:id="@+id/container_roots"

+3 −20

Original line number	Diff line number	Diff line
		@@ -51,28 +51,11 @@
		android:layout_width="256dp"
		android:layout_height="match_parent" />

		<LinearLayout
		<include layout="@layout/directory_cluster"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:orientation="vertical"
		android:background="@color/material_grey_50"
		android:elevation="8dp">

		<com.android.documentsui.DirectoryContainerView
		android:id="@+id/container_directory"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<FrameLayout
		android:id="@+id/container_save"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/material_grey_50"
		android:elevation="8dp" />

		</LinearLayout>
		android:elevation="8dp"
		android:background="@color/material_grey_50" />

		</LinearLayout>

0 → 100644

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

		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<com.android.documentsui.DocumentsToolBar
		android:id="@+id/toolbar"
		android:layout_width="match_parent"
		android:layout_height="?android:attr/actionBarSize"
		android:background="?android:attr/colorPrimary"
		android:elevation="8dp"
		android:theme="?actionBarTheme"
		android:popupTheme="?actionBarPopupTheme">

		<Spinner
		android:id="@+id/stack"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginStart="4dp"
		android:overlapAnchor="true" />

		</com.android.documentsui.DocumentsToolBar>

		<include layout="@layout/directory_cluster"/>

		</LinearLayout>