Port Remote Folder from 12.1 to 13.

Change-Id: If8cf9d5f054e8948ead702883b79f28db26c4d8b

11 files changed, 34 insertions, 10 deletions

diff --git a/res/drawable/download_badge.png b/res/drawable/download_badge.png
new file mode 100644
index 000000000..fad49b65f
--- /dev/null
+++ b/res/drawable/download_badge.png
diff --git a/res/drawable/triangle_icon.png b/res/drawable/triangle_icon.png
new file mode 100644
index 000000000..209cf851e
--- /dev/null
+++ b/res/drawable/triangle_icon.png
diff --git a/res/layout/all_apps_prediction_bar_icon.xml b/res/layout/all_apps_prediction_bar_icon.xml
index 341d8ef4f..0985e95c0 100644
--- a/res/layout/all_apps_prediction_bar_icon.xml
+++ b/res/layout/all_apps_prediction_bar_icon.xml
@@ -21,8 +21,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:paddingTop="@dimen/all_apps_prediction_icon_top_padding"
-    android:paddingBottom="@dimen/all_apps_prediction_icon_bottom_padding"
+    android:paddingTop="@dimen/all_apps_icon_top_bottom_padding"
+    android:paddingBottom="@dimen/all_apps_icon_top_bottom_padding"
     android:focusable="true"
     android:background="@drawable/focusable_view_bg"
     launcher:iconDisplay="all_apps" />
diff --git a/res/layout/custom_predicted_apps_footer.xml b/res/layout/custom_predicted_apps_footer.xml
new file mode 100644
index 000000000..14c171ee6
--- /dev/null
+++ b/res/layout/custom_predicted_apps_footer.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+</merge>
\ No newline at end of file
diff --git a/res/layout/custom_predicted_apps_header.xml b/res/layout/custom_predicted_apps_header.xml
new file mode 100644
index 000000000..14c171ee6
--- /dev/null
+++ b/res/layout/custom_predicted_apps_header.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+</merge>
\ No newline at end of file
diff --git a/res/layout/remote_folder.xml b/res/layout/remote_folder.xml
new file mode 100644
index 000000000..49d47292d
--- /dev/null
+++ b/res/layout/remote_folder.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+</merge>
\ No newline at end of file
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index d948ec9ca..516da303c 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -20,12 +20,18 @@
     android:layout_height="wrap_content"
     android:background="@drawable/folder_bg"
     android:elevation="5dp"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:layout_margin="@dimen/folder_margin"
+    android:layout_gravity="bottom|center_horizontal">
+
+    <include layout="@layout/remote_folder"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <FrameLayout
         android:id="@+id/folder_content_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
 
         <!-- Actual size of the indicator doesn't matter as it is scaled to match the view size -->
 
@@ -36,8 +42,8 @@
 
         <com.android.launcher3.FolderPagedView
             android:id="@+id/folder_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:paddingLeft="4dp"
             android:paddingRight="4dp"
             android:paddingTop="8dp"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1b8962170..3ab7f8800 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -54,6 +54,9 @@
     <color name="all_apps_grid_section_text_color_dark">#FFF</color>
     <color name="all_apps_search_market_button_focused_bg_color">#DDDDDD</color>
 
+    <color name="drawer_divider_light">#14000000</color>
+    <color name="drawer_divider_dark">#14ffffff</color>
+
     <!-- Widgets view -->
     <color name="widgets_view_section_text_color">#FFFFFF</color>
     <color name="widgets_view_item_text_color">#C4C4C4</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ba6c89ce9..dfd9428bd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -85,14 +85,12 @@
     <dimen name="all_apps_icon_width_gap">24dp</dimen>
     <dimen name="all_apps_icon_width_gap_with_sections">12dp</dimen>
     <dimen name="all_apps_icon_size_with_sections">48dp</dimen>
-    <!-- The top padding should account for the existing all_apps_list_top_bottom_padding -->
-    <dimen name="all_apps_prediction_icon_top_padding">8dp</dimen>
-    <dimen name="all_apps_prediction_icon_bottom_padding">18dp</dimen>
     <dimen name="all_apps_list_top_bottom_padding">8dp</dimen>
     <dimen name="all_apps_empty_search_message_top_offset">40dp</dimen>
     <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen>
     <dimen name="all_apps_background_canvas_width">700dp</dimen>
     <dimen name="all_apps_background_canvas_height">475dp</dimen>
+    <dimen name="all_apps_prediction_bar_divider_offset">5dp</dimen>
 
 <!-- Widget tray -->
     <dimen name="widget_container_inset">8dp</dimen>
@@ -139,6 +137,7 @@
     <dimen name="folder_lock_margin">6dp</dimen>
     <dimen name="folder_name_padding">10dp</dimen>
     <dimen name="folder_lock_icon">48dp</dimen>
+    <dimen name="folder_margin">24dp</dimen>
 
     <!-- Folder icon dimens -->
     <dimen name="folder_icon">64dp</dimen>
diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml
index 5917c20aa..342c495e2 100644
--- a/res/values/preferences_defaults.xml
+++ b/res/values/preferences_defaults.xml
@@ -11,4 +11,6 @@
     <bool name="preferences_interface_use_horizontal_scrubber_default">true</bool>
     <bool name="preferences_interface_drawer_search_default">true</bool>
     <bool name="preferences_interface_allow_rotation">false</bool>
+    <bool name="preferences_interface_homescreen_remote_folder_default">false</bool>
+    <integer name="preferences_interface_homescreen_id_default">1</integer>
 </resources>
diff --git a/res/values/tags.xml b/res/values/tags.xml
new file mode 100644
index 000000000..6fb722840
--- /dev/null
+++ b/res/values/tags.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item type="id" name="fast_scroll_focus_applicator_tag"/>
+</resources>
\ No newline at end of file