From d27906e581695492c68afd88a88840c7f3552c6e Mon Sep 17 00:00:00 2001 From: Ben Kwa Date: Tue, 10 Nov 2015 21:02:47 -0800 Subject: [PATCH] Tweak grid item layout. Adjust colors to match spec. BUG=10960718 BUG=24326989 Change-Id: I74da23fe0b40d713a3f435d1467d26d707e76fca --- .../res/drawable/item_root_background.xml | 24 ---- .../res/layout-sw720dp-land/item_doc_list.xml | 2 +- .../DocumentsUI/res/layout/drawer_layout.xml | 2 +- .../DocumentsUI/res/layout/fixed_layout.xml | 7 +- .../res/layout/fragment_directory.xml | 4 +- .../DocumentsUI/res/layout/item_doc_grid.xml | 132 +++++++++--------- .../DocumentsUI/res/layout/item_doc_list.xml | 4 +- packages/DocumentsUI/res/layout/item_root.xml | 3 +- packages/DocumentsUI/res/values/colors.xml | 14 +- packages/DocumentsUI/res/values/styles.xml | 2 + .../dirlist/DirectoryFragment.java | 39 ++---- .../dirlist/DirectoryItemAnimator.java | 10 +- 12 files changed, 100 insertions(+), 143 deletions(-) delete mode 100644 packages/DocumentsUI/res/drawable/item_root_background.xml diff --git a/packages/DocumentsUI/res/drawable/item_root_background.xml b/packages/DocumentsUI/res/drawable/item_root_background.xml deleted file mode 100644 index c403159cee8cd..0000000000000 --- a/packages/DocumentsUI/res/drawable/item_root_background.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - diff --git a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml index 381e1c89b4281..fe06eafea7136 100644 --- a/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml +++ b/packages/DocumentsUI/res/layout-sw720dp-land/item_doc_list.xml @@ -17,7 +17,7 @@ diff --git a/packages/DocumentsUI/res/layout/drawer_layout.xml b/packages/DocumentsUI/res/layout/drawer_layout.xml index 0dac0d550eb83..0146f142114f3 100644 --- a/packages/DocumentsUI/res/layout/drawer_layout.xml +++ b/packages/DocumentsUI/res/layout/drawer_layout.xml @@ -61,7 +61,7 @@ android:layout_gravity="start" android:orientation="vertical" android:elevation="16dp" - android:background="@*android:color/white"> + android:background="@color/window_background"> + android:baselineAligned="false"> + android:elevation="8dp" /> diff --git a/packages/DocumentsUI/res/layout/fragment_directory.xml b/packages/DocumentsUI/res/layout/fragment_directory.xml index ada7f49dbd1fd..f9bbccb578092 100644 --- a/packages/DocumentsUI/res/layout/fragment_directory.xml +++ b/packages/DocumentsUI/res/layout/fragment_directory.xml @@ -17,7 +17,6 @@ @@ -78,8 +77,7 @@ android:paddingBottom="0dp" android:clipToPadding="false" android:scrollbarStyle="outsideOverlay" - android:drawSelectorOnTop="true" - android:background="@color/directory_background" /> + android:drawSelectorOnTop="true" /> diff --git a/packages/DocumentsUI/res/layout/item_doc_grid.xml b/packages/DocumentsUI/res/layout/item_doc_grid.xml index 1dfb34a9b19bb..dcd5cfd16ce5a 100644 --- a/packages/DocumentsUI/res/layout/item_doc_grid.xml +++ b/packages/DocumentsUI/res/layout/item_doc_grid.xml @@ -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"> + - + android:layout_height="wrap_content"> + - - - + - + - - - - - - - - - + android:layout_height="wrap_content" + android:layout_below="@id/thumbnail" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:paddingLeft="12dp" + android:paddingRight="12dp"> + + + + + + + + + + - + + android:baselineAligned="false"> #ffbdbdbd + + #fff1f1f1 + @*android:color/primary_dark_material_dark @*android:color/material_blue_grey_900 @*android:color/accent_material_light @color/material_grey_400 - - @*android:color/material_grey_300 - @android:color/white - @android:color/white + #88ffffff #44000000 + + #fffafafa + #ffe0f2f1 + diff --git a/packages/DocumentsUI/res/values/styles.xml b/packages/DocumentsUI/res/values/styles.xml index 15d17cc6b7371..6712e2dd45372 100644 --- a/packages/DocumentsUI/res/values/styles.xml +++ b/packages/DocumentsUI/res/values/styles.xml @@ -25,6 +25,7 @@ @style/ActionBarTheme @style/ActionBarPopupTheme + @color/window_background @color/primary_dark @color/primary @color/accent @@ -44,6 +45,7 @@ @style/ActionBarTheme @style/ActionBarPopupTheme + @color/window_background @color/primary_dark @color/primary @color/accent diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 18dd8c88858f0..8b3893f36cffe 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -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); diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java index 0963845db6280..1135c215660e2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryItemAnimator.java @@ -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