Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak grid item layout. Adjust colors to match spec."

Browse Source
This commit is contained in:
Ben Kwa
2015-11-19 18:52:55 +00:00
committed by Android (Google) Code Review
parent d90b3c3df8 d27906e581
commit 368c31d143
12 changed files with 100 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/DocumentsUI/res/drawable/item_root_background.xml
View File

@@ -1,24 +0,0 @@
<?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>

2
packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml
View File

@@ -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">

2
packages/DocumentsUI/res/layout/drawer_layout.xml
View File

@@ -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"

7
packages/DocumentsUI/res/layout/fixed_layout.xml
View File

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

4
packages/DocumentsUI/res/layout/fragment_directory.xml
View File

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

132
packages/DocumentsUI/res/layout/item_doc_grid.xml
View File

@@ -18,101 +18,101 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/grid_item_margin"
android:background="@color/item_doc_grid_background"
android:background="@color/item_doc_background"
android:focusable="true">
<!-- Main item thumbnail. Comprised of two overlapping images, the
visibility of which is controlled by code in
DirectoryFragment.java. -->
<FrameLayout
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="8dp">
android:layout_height="wrap_content">
<com.android.documentsui.GridItemThumbnail
android:id="@+id/icon_thumb"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
android:contentDescription="@null" />
<ImageView
<com.android.documentsui.GridItemThumbnail
android:id="@+id/icon_mime"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerInside"
android:contentDescription="@null" />
</FrameLayout>
<!-- Item nameplate. Has a mime-type icon and some text fields (title,
size, mod-time, etc). -->
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/thumbnail"
android:layout_toEndOf="@android:id/icon1"
android:singleLine="true"
android:ellipsize="middle"
android:textAlignment="viewStart"
android:paddingEnd="12dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="@*android:color/primary_text_default_material_light" />
<TextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_toEndOf="@android:id/icon1"
android:paddingEnd="4dp"
android:singleLine="true"
android:ellipsize="end"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Caption"
android:textColor="@*android:color/primary_text_default_material_light" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_toEndOf="@id/size"
android:paddingEnd="12dp"
android:singleLine="true"
android:ellipsize="end"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Caption"
android:textColor="@*android:color/primary_text_default_material_light" />
<ImageView
android:id="@android:id/icon1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_below="@id/thumbnail"
android:layout_alignParentLeft="true"
android:layout_alignBottom="@id/size"
android:layout_alignTop="@android:id/title"
android:scaleType="centerInside"
android:contentDescription="@null"
android:paddingStart="12dp"
android:paddingEnd="8dp"/>
<!-- Use an explicit spacer so we can align things to it. -->
<Space
android:id="@+id/bottomPadding"
<RelativeLayout
android:id="@+id/nameplate"
android:layout_width="match_parent"
android:layout_height="8dp"
android:layout_below="@id/size" />
android:layout_height="wrap_content"
android:layout_below="@id/thumbnail"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="12dp"
android:paddingRight="12dp">
<ImageView
android:id="@android:id/icon1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:scaleType="centerInside"
android:contentDescription="@null"/>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toEndOf="@android:id/icon1"
android:singleLine="true"
android:ellipsize="middle"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="@*android:color/primary_text_default_material_light" />
<TextView
android:id="@+id/size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@android:id/icon1"
android:layout_below="@android:id/title"
android:layout_marginEnd="4dp"
android:singleLine="true"
android:ellipsize="end"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Caption"
android:textColor="@*android:color/primary_text_default_material_light" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_toEndOf="@id/size"
android:singleLine="true"
android:ellipsize="end"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Caption"
android:textColor="@*android:color/primary_text_default_material_light" />
</RelativeLayout>
<!-- An overlay that draws the item border when it is focused. -->
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/bottomPadding"
android:layout_alignBottom="@id/nameplate"
android:layout_alignTop="@id/thumbnail"
android:layout_alignLeft="@id/thumbnail"
android:layout_alignRight="@id/thumbnail"

4
packages/DocumentsUI/res/layout/item_doc_list.xml
View File

@@ -17,10 +17,10 @@
<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">
<View
android:id="@+id/focus_indicator"
android:layout_width="4dp"

3
packages/DocumentsUI/res/layout/item_root.xml
View File

@@ -22,8 +22,7 @@
android:paddingEnd="@dimen/list_item_padding"
android:gravity="center_vertical"
android:orientation="horizontal"
android:baselineAligned="false"
android:background="@drawable/item_root_background">
android:baselineAligned="false">
<FrameLayout
android:layout_width="@dimen/icon_size"

14
packages/DocumentsUI/res/values/colors.xml
View File

@@ -17,14 +17,20 @@
<resources>
<color name="material_grey_400">#ffbdbdbd</color>
<!-- This is the window background, but also the background for anything
else that needs to manually declare a background matching the "default"
app background (e.g. the drawer overlay). -->
<color name="window_background">#fff1f1f1</color>
<color name="primary_dark">@*android:color/primary_dark_material_dark</color>
<color name="primary">@*android:color/material_blue_grey_900</color>
<color name="accent">@*android:color/accent_material_light</color>
<color name="action_mode">@color/material_grey_400</color>
<color name="directory_background">@*android:color/material_grey_300</color>
<color name="item_doc_grid_background">@android:color/white</color>
<color name="item_doc_grid_protect_background">@android:color/white</color>
<color name="band_select_background">#88ffffff</color>
<color name="band_select_border">#44000000</color>
<color name="item_doc_background">#fffafafa</color>
<color name="item_doc_background_selected">#ffe0f2f1</color>
</resources>

2
packages/DocumentsUI/res/values/styles.xml
View File

@@ -25,6 +25,7 @@
<item name="actionBarTheme">@style/ActionBarTheme</item>
<item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>
@@ -44,6 +45,7 @@
<item name="actionBarTheme">@style/ActionBarTheme</item>
<item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>
<item name="android:windowBackground">@color/window_background</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorAccent">@color/accent</item>

39
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
View File

@@ -943,7 +943,6 @@ public class DirectoryFragment extends Fragment {
public void setSelected(boolean selected) {
itemView.setActivated(selected);
itemView.setBackgroundColor(selected ? mSelectedItemColor : mDefaultItemColor);
}
@Override
@@ -1080,8 +1079,6 @@ public class DirectoryFragment extends Fragment {
holder.setSelected(isSelected(position));
final View line2 = itemView.findViewById(R.id.line2);
final ImageView iconMime = (ImageView) itemView.findViewById(R.id.icon_mime);
final ImageView iconThumb = (ImageView) itemView.findViewById(R.id.icon_thumb);
final TextView title = (TextView) itemView.findViewById(android.R.id.title);
@@ -1138,14 +1135,11 @@ public class DirectoryFragment extends Fragment {
getDocumentIcon(mContext, docAuthority, docId, docMimeType, docIcon, state));
}
boolean hasLine2 = false;
final boolean hideTitle = (state.derivedMode == MODE_GRID) && mHideGridTitles;
if (!hideTitle) {
if ((state.derivedMode == MODE_GRID) && mHideGridTitles) {
title.setVisibility(View.GONE);
} else {
title.setText(docDisplayName);
title.setVisibility(View.VISIBLE);
} else {
title.setVisibility(View.GONE);
}
Drawable iconDrawable = null;
@@ -1161,7 +1155,6 @@ public class DirectoryFragment extends Fragment {
if (alwaysShowSummary) {
summary.setText(root.getDirectoryString());
summary.setVisibility(View.VISIBLE);
hasLine2 = true;
} else {
if (iconDrawable != null && roots.isIconUniqueBlocking(root)) {
// No summary needed if icon speaks for itself
@@ -1170,7 +1163,6 @@ public class DirectoryFragment extends Fragment {
summary.setText(root.getDirectoryString());
summary.setVisibility(View.VISIBLE);
summary.setTextAlignment(TextView.TEXT_ALIGNMENT_TEXT_END);
hasLine2 = true;
}
}
}
@@ -1187,48 +1179,37 @@ public class DirectoryFragment extends Fragment {
if (docSummary != null) {
summary.setText(docSummary);
summary.setVisibility(View.VISIBLE);
hasLine2 = true;
} else {
summary.setVisibility(View.INVISIBLE);
}
}
}
if (icon1 != null) icon1.setVisibility(View.GONE);
if (iconDrawable != null) {
icon1.setVisibility(View.VISIBLE);
icon1.setImageDrawable(iconDrawable);
} else {
icon1.setVisibility(View.GONE);
}
if (docLastModified == -1) {
date.setText(null);
} else {
date.setText(formatTime(mContext, docLastModified));
hasLine2 = true;
}
if (state.showSize) {
size.setVisibility(View.VISIBLE);
if (Document.MIME_TYPE_DIR.equals(docMimeType) || docSize == -1) {
size.setText(null);
} else {
size.setText(Formatter.formatFileSize(mContext, docSize));
hasLine2 = true;
}
} else {
if (!state.showSize || Document.MIME_TYPE_DIR.equals(docMimeType) || docSize == -1) {
size.setVisibility(View.GONE);
}
if (line2 != null) {
line2.setVisibility(hasLine2 ? View.VISIBLE : View.GONE);
} else {
size.setVisibility(View.VISIBLE);
size.setText(Formatter.formatFileSize(mContext, docSize));
}
setEnabledRecursive(itemView, enabled);
iconMime.setAlpha(iconAlpha);
iconThumb.setAlpha(iconAlpha);
if (icon1 != null) icon1.setAlpha(iconAlpha);
icon1.setAlpha(iconAlpha);
if (DEBUG_ENABLE_DND) {
setupDragAndDropOnDocumentView(itemView, cursor);

10
packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java
View File

@@ -25,6 +25,8 @@ import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.RecyclerView;
import android.util.TypedValue;
import com.android.documentsui.R;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -43,12 +45,8 @@ class DirectoryItemAnimator extends DefaultItemAnimator {
private final Integer mSelectedColor;
public DirectoryItemAnimator(Context context) {
mDefaultColor = context.getResources().getColor(android.R.color.transparent);
// Get the accent color.
TypedValue selColor = new TypedValue();
context.getTheme().resolveAttribute(android.R.attr.colorAccent, selColor, true);
// Set the opacity to 10%.
mSelectedColor = (selColor.data & 0x00ffffff) | 0x16000000;
mDefaultColor = context.getResources().getColor(R.color.item_doc_background);
mSelectedColor = context.getResources().getColor(R.color.item_doc_background_selected);
}
@Override