Merge "Implement files preview on pick mode specific action" (13d8dcb9) · Commits · e / os / android_packages_apps_DocumentsUI

res/drawable/circle_button_background.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->

		<shape xmlns:android="http://schemas.android.com/apk/res/android"
		android:shape="oval">
		<solid
		android:color="#66000000"/>
		</shape>
		No newline at end of file

res/drawable/ic_zoom_out.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 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.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M15,3l2.3,2.3 -2.89,2.87 1.42,1.42L18.7,6.7 21,9L21,3zM3,9l2.3,-2.3 2.87,2.89 1.42,-1.42L6.7,5.3 9,3L3,3zM9,21l-2.3,-2.3 2.89,-2.87 -1.42,-1.42L5.3,17.3 3,15v6zM21,15l-2.3,2.3 -2.87,-2.89 -1.42,1.42 2.89,2.87L15,21h6z"/>
		</vector>

res/layout-sw720dp/column_headers.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		android:gravity="center_vertical"
		android:minHeight="@dimen/list_item_height"
		android:paddingStart="@dimen/list_item_padding"
		android:paddingEnd="@dimen/list_item_padding"
		android:paddingEnd="@dimen/list_item_width"
		android:orientation="horizontal">
		<!-- Placeholder for icon -->
		<View
		@@ -52,7 +52,7 @@
		android:id="@android:id/title"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="0.375"
		android:layout_weight="0.4"
		android:layout_marginEnd="12dp"
		android:focusable="true"
		android:gravity="center_vertical"
		@@ -66,8 +66,8 @@
		android:id="@android:id/summary"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="0.25"
		android:layout_marginEnd="12dp"
		android:layout_weight="0"
		android:layout_marginEnd="0dp"
		android:focusable="true"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		@@ -80,7 +80,7 @@
		android:id="@+id/file_type"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="0.125"
		android:layout_weight="0.2"
		android:layout_marginEnd="12dp"
		android:focusable="true"
		android:gravity="center_vertical"
		@@ -94,7 +94,7 @@
		android:id="@+id/size"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="0.125"
		android:layout_weight="0.2"
		android:layout_marginEnd="12dp"
		android:focusable="true"
		android:gravity="center_vertical"
		@@ -108,7 +108,7 @@
		android:id="@+id/date"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="0.125"
		android:layout_weight="0.2"
		android:layout_marginEnd="12dp"
		android:focusable="true"
		android:gravity="center_vertical"

res/layout-sw720dp/item_doc_list.xml

+36 −9

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@drawable/list_item_background"
		android:background="?android:attr/selectableItemBackground"
		android:focusable="true"
		android:orientation="horizontal" >

		@@ -74,15 +74,14 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:orientation="horizontal"
		android:paddingEnd="@dimen/list_item_padding" >
		android:orientation="horizontal" >

		<TextView
		android:id="@android:id/title"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.375"
		android:layout_weight="0.4"
		android:ellipsize="middle"
		android:singleLine="true"
		android:textAlignment="viewStart"
		@@ -93,8 +92,8 @@
		android:id="@android:id/summary"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.25"
		android:layout_marginEnd="0dp"
		android:layout_weight="0"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		@@ -106,7 +105,7 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.125"
		android:layout_weight="0.2"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		@@ -118,7 +117,7 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.125"
		android:layout_weight="0.2"
		android:ellipsize="end"
		android:minWidth="70dp"
		android:singleLine="true"
		@@ -131,7 +130,7 @@
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.125"
		android:layout_weight="0.2"
		android:ellipsize="end"
		android:minWidth="70dp"
		android:singleLine="true"
		@@ -139,6 +138,34 @@
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />
		</LinearLayout>

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">

		<FrameLayout
		android:id="@+id/preview_icon"
		android:layout_width="@dimen/list_item_width"
		android:layout_height="@dimen/list_item_height"
		android:padding="@dimen/list_item_icon_padding"
		android:focusable="true">

		<ImageView
		android:layout_width="@dimen/check_icon_size"
		android:layout_height="@dimen/check_icon_size"
		android:layout_gravity="center"
		android:scaleType="fitCenter"
		android:tint="?android:attr/textColorPrimary"
		android:src="@drawable/ic_zoom_out"/>

		</FrameLayout>

		<android.widget.Space
		android:layout_width="@dimen/list_item_width"
		android:layout_height="@dimen/list_item_height"/>

		</FrameLayout>

		</LinearLayout>

		</LinearLayout>
		No newline at end of file

res/layout/item_dir_grid.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		decide to rip these out, please be sure to check out focus and keyboards. -->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/item_root"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"