Merge "Add checkmark icons for selection." (43f28c54) · Commits · e / os / android_packages_apps_DocumentsUI

res/drawable/ic_check_circle.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2016 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="#FF009688"
		android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>
		</vector>

res/layout-sw720dp-land/item_doc_list.xml

+39 −35

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2013 The Android Open Source Project
		<!--
		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.
		@@ -18,8 +19,8 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/item_doc_background"
		android:orientation="horizontal"
		android:focusable="true">
		android:focusable="true"
		android:orientation="horizontal" >

		<View
		android:id="@+id/focus_indicator"
		@@ -29,37 +30,50 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="@dimen/list_item_height"
		android:paddingStart="@dimen/list_item_padding"
		android:paddingEnd="@dimen/list_item_padding"
		android:baselineAligned="false"
		android:gravity="center_vertical"
		android:minHeight="@dimen/list_item_height"
		android:orientation="horizontal"
		android:baselineAligned="false">
		android:paddingEnd="@dimen/list_item_padding"
		android:paddingStart="@dimen/list_item_padding" >

		<FrameLayout
		android:id="@android:id/icon"
		android:layout_width="@dimen/icon_size"
		android:layout_height="@dimen/icon_size"
		android:layout_marginStart="0dp"
		android:layout_marginEnd="16dp">
		android:layout_width="@dimen/list_item_thumbnail_size"
		android:layout_height="@dimen/list_item_thumbnail_size"
		android:layout_marginEnd="16dp"
		android:layout_marginStart="0dp" >

		<ImageView
		android:id="@+id/icon_mime"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:scaleType="centerInside"
		android:contentDescription="@null" />
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:contentDescription="@null"
		android:scaleType="centerInside" />

		<ImageView
		android:id="@+id/icon_thumb"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"
		android:contentDescription="@null" />
		android:layout_gravity="center"
		android:contentDescription="@null"
		android:scaleType="centerCrop" />

		<ImageView
		android:id="@+id/icon_check"
		android:layout_width="@dimen/check_icon_size"
		android:layout_height="@dimen/check_icon_size"
		android:layout_gravity="center"
		android:alpha="0"
		android:contentDescription="@null"
		android:scaleType="fitCenter"
		android:src="@drawable/ic_check_circle" />

		</FrameLayout>

		<!-- This is the one special case where we want baseline alignment! -->

		<LinearLayout
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		@@ -70,30 +84,22 @@
		android:id="@android:id/title"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="0.5"
		android:layout_marginEnd="12dp"
		android:singleLine="true"
		android:layout_weight="0.5"
		android:ellipsize="middle"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textColor="?android:attr/textColorPrimary" />

		<ImageView
		android:id="@android:id/icon1"
		android:layout_width="@dimen/root_icon_size"
		android:layout_height="@dimen/root_icon_size"
		android:layout_marginEnd="8dp"
		android:scaleType="centerInside"
		android:contentDescription="@null" />

		<TextView
		android:id="@android:id/summary"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="0.25"
		android:layout_marginEnd="12dp"
		android:singleLine="true"
		android:layout_weight="0.25"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />
		@@ -102,11 +108,11 @@
		android:id="@+id/size"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="0.125"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.125"
		android:ellipsize="end"
		android:minWidth="70dp"
		android:singleLine="true"
		android:ellipsize="end"
		android:textAlignment="viewEnd"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />
		@@ -115,17 +121,15 @@
		android:id="@+id/date"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="0.125"
		android:layout_marginEnd="12dp"
		android:layout_weight="0.125"
		android:ellipsize="end"
		android:minWidth="70dp"
		android:singleLine="true"
		android:ellipsize="end"
		android:textAlignment="viewEnd"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />

		</LinearLayout>

		</LinearLayout>

		</com.android.documentsui.ListItem>

res/layout/item_dir_grid.xml

+38 −18

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2013 The Android Open Source Project
		<!--
		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.
		@@ -26,25 +27,43 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:paddingLeft="12dp"
		android:paddingRight="12dp">
		android:paddingRight="12dp"
		android:paddingTop="16dp"
		android:gravity="center_vertical">

		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginEnd="8dp" >

		<ImageView
		android:src="@drawable/ic_doc_folder"
		android:id="@+id/icon_mime_sm"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_marginEnd="8dp"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:contentDescription="@null"
		android:scaleType="centerInside"
		android:contentDescription="@null"/>
		android:src="@drawable/ic_doc_folder" />

		<ImageView
		android:id="@+id/icon_check"
		android:layout_width="@dimen/check_icon_size"
		android:layout_height="@dimen/check_icon_size"
		android:alpha="0"
		android:contentDescription="@null"
		android:scaleType="fitCenter"
		android:src="@drawable/ic_check_circle" />

		</FrameLayout>

		<TextView
		android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="middle"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textColor="@*android:color/primary_text_default_material_light" />
		@@ -52,11 +71,12 @@
		</LinearLayout>

		<!-- An overlay that draws the item border when it is focused. -->

		<View
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:contentDescription="@null"
		android:background="@drawable/item_doc_grid_border"
		android:contentDescription="@null"
		android:duplicateParentState="true" />

		</FrameLayout>

res/layout/item_doc_grid.xml

+19 −7

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@
		android:contentDescription="@null" />

		<com.android.documentsui.GridItemThumbnail
		android:id="@+id/icon_mime"
		android:id="@+id/icon_mime_lg"
		android:layout_width="@dimen/icon_size"
		android:layout_height="@dimen/icon_size"
		android:layout_gravity="center"
		@@ -62,13 +62,25 @@
		android:paddingRight="12dp">

		<ImageView
		android:id="@android:id/icon1"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:id="@+id/icon_mime_sm"
		android:layout_width="@dimen/grid_item_icon_size"
		android:layout_height="@dimen/grid_item_icon_size"
		android:layout_marginEnd="8dp"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true"
		android:scaleType="center"
		android:contentDescription="@null"/>

		<ImageView
		android:id="@+id/icon_check"
		android:src="@drawable/ic_check_circle"
		android:alpha="0"
		android:layout_width="@dimen/check_icon_size"
		android:layout_height="@dimen/check_icon_size"
		android:layout_marginEnd="8dp"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true"
		android:scaleType="centerInside"
		android:scaleType="fitCenter"
		android:contentDescription="@null"/>

		<TextView
		@@ -76,7 +88,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentTop="true"
		android:layout_toEndOf="@android:id/icon1"
		android:layout_toEndOf="@id/icon_mime_sm"
		android:singleLine="true"
		android:ellipsize="middle"
		android:textAlignment="viewStart"
		@@ -87,7 +99,7 @@
		android:id="@+id/size"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_toEndOf="@android:id/icon1"
		android:layout_toEndOf="@id/icon_mime_sm"
		android:layout_below="@android:id/title"
		android:layout_marginEnd="4dp"
		android:singleLine="true"

res/layout/item_doc_list.xml

+43 −51

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2013 The Android Open Source Project
		<!--
		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.
		@@ -18,8 +19,8 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@color/item_doc_background"
		android:orientation="horizontal"
		android:focusable="true">
		android:focusable="true"
		android:orientation="horizontal" >

		<View
		android:id="@+id/focus_indicator"
		@@ -29,33 +30,43 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="@dimen/list_item_height"
		android:paddingStart="@dimen/list_item_padding"
		android:paddingEnd="@dimen/list_item_padding"
		android:baselineAligned="false"
		android:gravity="center_vertical"
		android:minHeight="@dimen/list_item_height"
		android:orientation="horizontal"
		android:baselineAligned="false">
		android:paddingEnd="@dimen/list_item_padding"
		android:paddingStart="@dimen/list_item_padding" >

		<FrameLayout
		android:id="@android:id/icon"
		android:layout_width="@dimen/icon_size"
		android:layout_height="@dimen/icon_size"
		android:layout_width="@dimen/list_item_thumbnail_size"
		android:layout_height="@dimen/list_item_thumbnail_size"
		android:layout_marginEnd="16dp" >

		<ImageView
		android:id="@+id/icon_mime"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:scaleType="centerInside"
		android:contentDescription="@null" />
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:contentDescription="@null"
		android:scaleType="centerInside" />

		<ImageView
		android:id="@+id/icon_thumb"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"
		android:contentDescription="@null" />
		android:contentDescription="@null"
		android:scaleType="centerCrop" />

		<ImageView
		android:id="@+id/icon_check"
		android:layout_width="@dimen/check_icon_size"
		android:layout_height="@dimen/check_icon_size"
		android:layout_gravity="center"
		android:alpha="0"
		android:contentDescription="@null"
		android:scaleType="fitCenter"
		android:src="@drawable/ic_check_circle" />
		</FrameLayout>

		<LinearLayout
		@@ -64,47 +75,31 @@
		android:layout_weight="1"
		android:orientation="vertical" >

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:baselineAligned="false">

		<TextView
		android:id="@android:id/title"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:singleLine="true"
		android:ellipsize="middle"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Subhead"
		android:textColor="?android:attr/textColorPrimary" />

		<ImageView
		android:id="@android:id/icon1"
		android:layout_width="@dimen/root_icon_size"
		android:layout_height="@dimen/root_icon_size"
		android:layout_marginStart="8dp"
		android:scaleType="centerInside"
		android:contentDescription="@null" />

		</LinearLayout>

		<LinearLayout
		android:id="@+id/line2"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:baselineAligned="false"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		android:baselineAligned="false">
		android:orientation="horizontal" >

		<TextView
		android:id="@+id/date"
		android:layout_width="90dp"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />
		@@ -114,8 +109,8 @@
		android:layout_width="90dp"
		android:layout_height="wrap_content"
		android:layout_marginStart="8dp"
		android:singleLine="true"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />
		@@ -124,18 +119,15 @@
		android:id="@android:id/summary"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:layout_marginStart="8dp"
		android:singleLine="true"
		android:layout_weight="1"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAlignment="viewStart"
		android:textAppearance="@android:style/TextAppearance.Material.Body1"
		android:textColor="?android:attr/textColorSecondary" />

		</LinearLayout>

		</LinearLayout>

		</LinearLayout>

		</com.android.documentsui.ListItem>