Change Move To Dialog (Quantum)

Added folder label drawables to move to dialog (single
folder selection) and removed dividers out.

Bug: 17073025
Change-Id: I491577d126d9d4d6a328e1392b6f1975217397eb

4 files changed, 29 insertions, 8 deletions

diff --git a/res/layout/single_folders_view.xml b/res/layout/single_folders_view.xml
index 3f048da01..ebb4adb9d 100644
--- a/res/layout/single_folders_view.xml
+++ b/res/layout/single_folders_view.xml
@@ -19,19 +19,25 @@
 
 <!-- Describes an individual toggleable folder entry to be displayed in a list of folders in
      a folder selection UI. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/folders"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/single_folder_list_item_height"
+    android:layout_gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <!-- Note: the checkbox is not focusable because the parent list item itself handles
          the toggling -->
-    <TextView android:id="@+id/folder_name"
-        style="@style/FolderSelectionItemStyle" />
+    <ImageView
+        android:id="@+id/folder_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        style="@style/SingleFolderListIconStyle" />
 
-    <View
-        android:id="@+id/color_block"
-        style="@style/FolderColorBoxStyle" />
+    <TextView android:id="@+id/folder_name"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        style="@style/SingleFolderSelectionItemStyle" />
 
-</FrameLayout>
+</LinearLayout>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index a6b45b1c9..96b541093 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -200,6 +200,10 @@
         <item name="android:paddingEnd">@dimen/snack_bar_margin_horizontal</item>
     </style>
 
+    <style name="SingleFolderListIconStyle">
+        <item name="android:layout_marginStart">@dimen/single_folder_list_item_start_margin</item>
+    </style>
+
     <style name="FolderSelectionItemStyle" parent="AbstractFolderSelectionItemStyle">
         <item name="android:layout_marginStart">@dimen/folder_selection_margin_start</item>
         <item name="android:layout_marginEnd">@dimen/folder_selection_margin_end</item>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index e8496497d..d664e8bc1 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -88,6 +88,9 @@
     <dimen name="folder_list_item_start_margin">16dp</dimen>
     <dimen name="folder_list_item_text_start_margin">32dp</dimen>
     <dimen name="folder_list_item_end_margin">8dp</dimen>
+    <dimen name="single_folder_list_item_height">48sp</dimen>
+    <dimen name="single_folder_list_item_start_margin">24dp</dimen>
+    <dimen name="single_folder_list_item_padding">0dp</dimen>
     <!-- Let's try to keep this consistent with color_block_height above, unless there's a good reason not to. -->
     <dimen name="folder_swatch_height">6dip</dimen>
     <dimen name="folder_list_popup_width">200dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cf2ea1c64..f6aac9559 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -421,6 +421,10 @@
         <item name="android:layout_marginRight">@dimen/folder_selection_margin_end</item>
     </style>
 
+    <style name="SingleFolderSelectionItemStyle" parent="FolderSelectionItemStyle">
+         <item name="android:padding">@dimen/single_folder_list_item_padding</item>
+    </style>
+
     <!-- Widget styles -->
     <style name="WidgetTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:singleLine">true</item>
@@ -610,6 +614,10 @@
         <item name="android:paddingRight">20dp</item>
     </style>
 
+    <style name="SingleFolderListIconStyle">
+        <item name="android:layout_marginLeft">@dimen/single_folder_list_item_start_margin</item>
+    </style>
+
     <style name="FolderListItemStartStyle">
         <item name="android:layout_marginLeft">@dimen/folder_list_item_text_start_margin</item>
     </style>