Fixing minor bugs (5085316, 5082963, 5042828)

- Adding separator between qsb and workspace content
- Adding a bit of spacing between drawables and text in all apps
- Making the drop target area smaller...

Change-Id: I1bebe7dff20fc30e4896de1dcf23d23b62a31a07

9 files changed, 50 insertions, 29 deletions

diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 215f8db51..9d394d09c 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -22,9 +22,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <!-- Keep these behind the workspace so that they are not visible when
+         we go into AllApps -->
+    <include
+        android:id="@+id/qsb_divider"
+        layout="@layout/workspace_divider"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/qsb_bar_height"
+        android:layout_gravity="left" />
     <include
         android:id="@+id/dock_divider"
-        layout="@layout/dock_divider"
+        layout="@layout/workspace_divider"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginRight="@dimen/button_bar_height"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index f7e93f003..2f8d99529 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -25,8 +25,15 @@
     <!-- Keep these behind the workspace so that they are not visible when
          we go into AllApps -->
     <include
+        android:id="@+id/qsb_divider"
+        layout="@layout/workspace_divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/qsb_bar_height"
+        android:layout_gravity="top" />
+    <include
         android:id="@+id/dock_divider"
-        layout="@layout/dock_divider"
+        layout="@layout/workspace_divider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/button_bar_height"
@@ -48,8 +55,8 @@
         launcher:cellCountX="4"
         launcher:cellCountY="4"
         launcher:pageSpacing="@dimen/workspace_page_spacing"
-        launcher:scrollIndicatorPaddingLeft="@dimen/dock_divider_padding_left"
-        launcher:scrollIndicatorPaddingRight="@dimen/dock_divider_padding_right">
+        launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left"
+        launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right">
 
         <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
         <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
index abcc941f3..cad81f526 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/qsb_bar.xml
@@ -28,28 +28,26 @@
         android:id="@+id/drag_target_bar"
         android:visibility="gone">
 
-        <com.android.launcher2.DeleteDropTarget
+        <FrameLayout
             style="@style/DropTargetButtonContainer"
-            android:id="@+id/delete_target"
             android:layout_weight="1">
             <!-- Delete target -->
-            <TextView
+            <com.android.launcher2.DeleteDropTarget
                 style="@style/DropTargetButton"
                 android:id="@+id/delete_target_text"
                 android:text="@string/delete_zone_label_workspace"
                 android:drawableLeft="@drawable/delete_target_selector" />
-        </com.android.launcher2.DeleteDropTarget>
+        </FrameLayout>
 
-        <com.android.launcher2.InfoDropTarget
+        <FrameLayout
             style="@style/DropTargetButtonContainer"
-            android:id="@+id/info_target"
             android:layout_weight="1">
             <!-- Info target -->
-            <TextView
+            <com.android.launcher2.InfoDropTarget
                 style="@style/DropTargetButton"
                 android:id="@+id/info_target_text"
                 android:text="@string/info_target_label"
                 android:drawableLeft="@drawable/info_target_selector" />
-        </com.android.launcher2.InfoDropTarget>
+        </FrameLayout>
     </LinearLayout>
 </com.android.launcher2.SearchDropTargetBar>
diff --git a/res/layout/dock_divider.xml b/res/layout/workspace_divider.xml
index c3cac5276..257ea7c90 100644
--- a/res/layout/dock_divider.xml
+++ b/res/layout/workspace_divider.xml
@@ -16,9 +16,9 @@
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:paddingLeft="@dimen/dock_divider_padding_left"
-    android:paddingRight="@dimen/dock_divider_padding_right"
-    android:paddingTop="@dimen/dock_divider_padding_top"
-    android:paddingBottom="@dimen/dock_divider_padding_bottom"
+    android:paddingLeft="@dimen/workspace_divider_padding_left"
+    android:paddingRight="@dimen/workspace_divider_padding_right"
+    android:paddingTop="@dimen/workspace_divider_padding_top"
+    android:paddingBottom="@dimen/workspace_divider_padding_bottom"
     android:scaleType="fitXY"
     android:src="@drawable/hotseat_track_holo" />
\ No newline at end of file
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index d8cc7efec..c715bfb85 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -25,10 +25,10 @@
     <dimen name="workspace_top_padding">0dp</dimen>
     <dimen name="workspace_bottom_padding">0dp</dimen>
     <dimen name="workspace_page_spacing">8dp</dimen>
-    <dimen name="dock_divider_padding_left">0dp</dimen>
-    <dimen name="dock_divider_padding_right">0dp</dimen>
-    <dimen name="dock_divider_padding_top">12dp</dimen>
-    <dimen name="dock_divider_padding_bottom">12dp</dimen>
+    <dimen name="workspace_divider_padding_left">0dp</dimen>
+    <dimen name="workspace_divider_padding_right">0dp</dimen>
+    <dimen name="workspace_divider_padding_top">12dp</dimen>
+    <dimen name="workspace_divider_padding_bottom">12dp</dimen>
 
 <!-- AppsCustomize -->
     <dimen name="apps_customize_cell_width">80dp</dimen>
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index bc21a3aca..ea1a8e635 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -98,6 +98,8 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
+        <item name="android:paddingLeft">25dp</item>
+        <item name="android:paddingRight">25dp</item>
         <item name="android:textColor">#FFFFFFFF</item>
         <item name="android:textSize">16sp</item>
         <item name="android:shadowColor">#393939</item>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index e917c5087..2d27321ef 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -28,8 +28,8 @@
     <integer name="apps_customize_cellCountY">5</integer>
     <dimen name="apps_customize_pageLayoutWidthGap">-1dp</dimen>
     <dimen name="apps_customize_pageLayoutHeightGap">-1dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingTop">15dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingBottom">15dp</dimen>
+    <dimen name="apps_customize_pageLayoutPaddingTop">10dp</dimen>
+    <dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen>
     <dimen name="apps_customize_pageLayoutPaddingLeft">5dp</dimen>
     <dimen name="apps_customize_pageLayoutPaddingRight">5dp</dimen>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 215f698e3..f80b17cfc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,10 +24,10 @@
     <dimen name="workspace_max_gap">8dp</dimen>
     <dimen name="folder_cell_width">74dp</dimen>
     <dimen name="folder_cell_height">80dp</dimen>
-    <dimen name="dock_divider_padding_left">12dp</dimen>
-    <dimen name="dock_divider_padding_right">12dp</dimen>
-    <dimen name="dock_divider_padding_top">0dp</dimen>
-    <dimen name="dock_divider_padding_bottom">0dp</dimen>
+    <dimen name="workspace_divider_padding_left">12dp</dimen>
+    <dimen name="workspace_divider_padding_right">12dp</dimen>
+    <dimen name="workspace_divider_padding_top">0dp</dimen>
+    <dimen name="workspace_divider_padding_bottom">0dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">0dip</dimen>
@@ -53,7 +53,7 @@
     <dimen name="button_bar_height_plus_padding">88dp</dimen>
 
     <!-- Drag padding to add to the drop targets -->
-    <dimen name="drop_target_drag_padding">20dp</dimen>
+    <dimen name="drop_target_drag_padding">40dp</dimen>
 
     <!-- extra horizontal spacing between mini screen thumbnails ie. in all
          apps and in customization mode -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 62244a6c7..b356a424b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -66,15 +66,18 @@
 
     <style name="WorkspaceIcon.Portrait.AppsCustomize">
         <item name="android:background">@null</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
         <item name="android:paddingLeft">0dp</item>
         <item name="android:paddingRight">0dp</item>
-        <item name="android:drawablePadding">0dp</item>
+        <item name="android:drawablePadding">4dp</item>
         <item name="android:includeFontPadding">false</item>
     </style>
     <style name="WorkspaceIcon.Landscape.AppsCustomize">
         <item name="android:background">@null</item>
+        <item name="android:paddingTop">0dp</item>
         <item name="android:paddingBottom">0dp</item>
-        <item name="android:drawablePadding">0dp</item>
+        <item name="android:drawablePadding">2dp</item>
         <item name="android:includeFontPadding">false</item>
     </style>
 
@@ -105,6 +108,8 @@
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:drawablePadding">7.5dp</item>
+        <item name="android:paddingLeft">25dp</item>
+        <item name="android:paddingRight">25dp</item>
         <item name="android:textColor">#FFFFFFFF</item>
         <item name="android:textSize">16sp</item>
         <item name="android:shadowColor">#393939</item>