Update sidebar to more closely match material design specs.

Test: n/a
Bug: 35067861
Change-Id: I05aeeebdb8b5798965f4903f739142c327e0f990

7 files changed, 72 insertions, 11 deletions

diff --git a/res/drawable-ldrtl/roots_list_border.xml b/res/drawable-ldrtl/roots_list_border.xml
new file mode 100644
index 000000000..c8e845702
--- /dev/null
+++ b/res/drawable-ldrtl/roots_list_border.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetTop="-1dp"
+       android:insetBottom="-1dp"
+       android:insetRight="-1dp">
+    <shape android:shape="rectangle">
+        <stroke
+            android:width="1dp"
+            android:color="@color/drawer_border" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/res/drawable/roots_list_border.xml b/res/drawable/roots_list_border.xml
new file mode 100644
index 000000000..6ef6082ae
--- /dev/null
+++ b/res/drawable/roots_list_border.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetTop="-1dp"
+       android:insetBottom="-1dp"
+       android:insetLeft="-1dp">
+    <shape android:shape="rectangle">
+        <stroke
+            android:width="1dp"
+            android:color="@color/drawer_border" />
+    </shape>
+</inset>
\ No newline at end of file
diff --git a/res/layout/dropdown_sort_widget.xml b/res/layout/dropdown_sort_widget.xml
index 3415f9cfd..d837bf7c5 100644
--- a/res/layout/dropdown_sort_widget.xml
+++ b/res/layout/dropdown_sort_widget.xml
@@ -30,7 +30,9 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:textAppearance="@android:style/TextAppearance.Material.Subhead" />
+        android:fontFamily="sans-serif-medium"
+        android:textSize="14sp"
+        android:textColor="@color/sort_widget_text_color"/>
 
     <ImageView
         android:id="@+id/sort_arrow"
diff --git a/res/layout/fragment_roots.xml b/res/layout/fragment_roots.xml
index 208b6b2bf..382b98b5c 100644
--- a/res/layout/fragment_roots.xml
+++ b/res/layout/fragment_roots.xml
@@ -20,4 +20,5 @@
     android:layout_height="match_parent"
     android:paddingTop="8dp"
     android:listSelector="@drawable/root_list_selector"
-    android:divider="@null" />
+    android:divider="@null"
+    android:background="@drawable/roots_list_border" />
diff --git a/res/layout/item_root.xml b/res/layout/item_root.xml
index aff7bf3a1..d47fa4f4e 100644
--- a/res/layout/item_root.xml
+++ b/res/layout/item_root.xml
@@ -19,8 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="48dp"
-    android:paddingStart="@dimen/list_item_padding"
-    android:paddingEnd="@dimen/list_item_padding"
+    android:paddingStart="25dp"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:baselineAligned="false"
@@ -44,6 +43,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="16dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:orientation="vertical"
@@ -56,7 +56,8 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:textAlignment="viewStart"
-            android:textAppearance="@android:style/TextAppearance.Material.Menu"
+            android:fontFamily="sans-serif-medium"
+            android:textSize="14sp"
             android:textColor="@color/item_root_primary_text" />
 
         <TextView
@@ -66,12 +67,13 @@
             android:singleLine="true"
             android:ellipsize="end"
             android:textAlignment="viewStart"
-            android:textAppearance="@android:style/TextAppearance.Material.Caption"
-            android:textColor="@color/item_root_primary_text" />
+            android:fontFamily="sans-serif-medium"
+            android:textSize="13sp"
+            android:textColor="@color/root_details_color" />
 
     </LinearLayout>
 
-     <FrameLayout
+    <FrameLayout
         android:layout_width="@dimen/icon_size"
         android:layout_height="@dimen/icon_size"
         android:duplicateParentState="true">
diff --git a/res/layout/item_root_spacer.xml b/res/layout/item_root_spacer.xml
index b3beced9b..ebe211ccb 100644
--- a/res/layout/item_root_spacer.xml
+++ b/res/layout/item_root_spacer.xml
@@ -17,8 +17,8 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp">
 
     <View
         android:layout_width="match_parent"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7a21e50c7..f3281fc19 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,6 +20,7 @@
          app background (e.g. the drawer overlay). -->
     <color name="window_background">#fff1f1f1</color>
     <color name="drawer_background">#fff1f1f1</color>
+    <color name="drawer_border">#ffd4d4d4</color>
     <color name="directory_background">#fff7f7f7</color>
     <color name="menu_search_background">@android:color/transparent</color>
 
@@ -31,8 +32,11 @@
     <color name="band_select_background">#88ffffff</color>
     <color name="band_select_border">#44000000</color>
 
-    <color name="root_title_color">#ff5a5a5a</color>
+    <color name="root_title_color">#de000000</color>
     <color name="root_activated_color">@*android:color/Blue_700</color>
+    <color name="root_details_color">#8a000000</color>
+
+    <color name="sort_widget_text_color">#de000000</color>
 
     <color name="root_icon_color">#ff5a5a5a</color>
     <item name="root_icon_disabled_alpha" format="float" type="dimen">@*android:dimen/disabled_alpha_material_light</item>