Merge "Tweak grid item layout. Adjust colors to match spec." (368c31d1) · Commits · e / os / android_frameworks_base

packages/DocumentsUI/res/drawable/item_root_background.xml

deleted100644 → 0

+0 −24

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.
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_focused="true" android:state_activated="true">
		<color android:color="@color/material_grey_300" />
		</item>
		<item android:state_focused="false" android:state_activated="true">
		<color android:color="@color/material_grey_300" />
		</item>
		</selector>

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		<com.android.documentsui.ListItem xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="@drawable/item_doc_list_background"
		android:background="@color/item_doc_background"
		android:orientation="horizontal"
		android:focusable="true">

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@
		android:layout_gravity="start"
		android:orientation="vertical"
		android:elevation="16dp"
		android:background="@*android:color/white">
		android:background="@color/window_background">

		<Toolbar
		android:id="@+id/roots_toolbar"

+2 −5

Original line number	Diff line number	Diff line
		@@ -50,9 +50,7 @@
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="horizontal"
		android:baselineAligned="false"
		android:divider="?android:attr/dividerVertical"
		android:showDividers="middle">
		android:baselineAligned="false">

		<FrameLayout
		android:id="@+id/container_roots"
		@@ -62,8 +60,7 @@
		<include layout="@layout/directory_cluster"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:elevation="8dp"
		android:background="@color/material_grey_50" />
		android:elevation="8dp" />

		</LinearLayout>

+1 −3

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		<com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/material_grey_50"
		android:orientation="vertical"
		android:animateLayoutChanges="true">

		@@ -78,8 +77,7 @@
		android:paddingBottom="0dp"
		android:clipToPadding="false"
		android:scrollbarStyle="outsideOverlay"
		android:drawSelectorOnTop="true"
		android:background="@color/directory_background" />
		android:drawSelectorOnTop="true" />

		</FrameLayout>