Getting the Overview Mode to look up to spec

-> New assets, text, fonts
-> New spacing of pages (translated upwards)
-> Updated outline color to white (the ones we're drawing)

Change-Id: Ie664ac0598ae18b86ae6d54d1d6b497c13d2ee95

46 files changed, 25 insertions, 14 deletions

diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index 27106964f..000000000
--- a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/homescreen_blue_strong_holo.9.png b/res/drawable-hdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index c88ef14a2..000000000
--- a/res/drawable-hdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_gel_setting_icn.png b/res/drawable-hdpi/ic_gel_setting_icn.png
deleted file mode 100644
index f80594710..000000000
--- a/res/drawable-hdpi/ic_gel_setting_icn.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_gel_wallpaper_icn.png b/res/drawable-hdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index ad13c856d..000000000
--- a/res/drawable-hdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_gel_widget_icn.png b/res/drawable-hdpi/ic_gel_widget_icn.png
deleted file mode 100644
index 2bfd2c17b..000000000
--- a/res/drawable-hdpi/ic_gel_widget_icn.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_setting.png b/res/drawable-hdpi/ic_setting.png
new file mode 100644
index 000000000..c617154f1
--- /dev/null
+++ b/res/drawable-hdpi/ic_setting.png
diff --git a/res/drawable-hdpi/ic_wallpaper.png b/res/drawable-hdpi/ic_wallpaper.png
new file mode 100644
index 000000000..5e5d1186b
--- /dev/null
+++ b/res/drawable-hdpi/ic_wallpaper.png
diff --git a/res/drawable-hdpi/ic_widget.png b/res/drawable-hdpi/ic_widget.png
new file mode 100644
index 000000000..8c57af0de
--- /dev/null
+++ b/res/drawable-hdpi/ic_widget.png
diff --git a/res/drawable-hdpi/screenpanel.9.png b/res/drawable-hdpi/screenpanel.9.png
new file mode 100644
index 000000000..36e7dfd9c
--- /dev/null
+++ b/res/drawable-hdpi/screenpanel.9.png
diff --git a/res/drawable-hdpi/screenpanel_hover.9.png b/res/drawable-hdpi/screenpanel_hover.9.png
new file mode 100644
index 000000000..3321fc925
--- /dev/null
+++ b/res/drawable-hdpi/screenpanel_hover.9.png
diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index efdc86136..000000000
--- a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/homescreen_blue_strong_holo.9.png b/res/drawable-mdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index e3edb6490..000000000
--- a/res/drawable-mdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_gel_setting_icn.png b/res/drawable-mdpi/ic_gel_setting_icn.png
deleted file mode 100644
index 096e6bcc8..000000000
--- a/res/drawable-mdpi/ic_gel_setting_icn.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_gel_wallpaper_icn.png b/res/drawable-mdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index 61a7b7ee1..000000000
--- a/res/drawable-mdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_gel_widget_icn.png b/res/drawable-mdpi/ic_gel_widget_icn.png
deleted file mode 100644
index 8a2cb7a2f..000000000
--- a/res/drawable-mdpi/ic_gel_widget_icn.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_setting.png b/res/drawable-mdpi/ic_setting.png
new file mode 100644
index 000000000..0c8ae9d65
--- /dev/null
+++ b/res/drawable-mdpi/ic_setting.png
diff --git a/res/drawable-mdpi/ic_setting_icn.png b/res/drawable-mdpi/ic_setting_icn.png
new file mode 100644
index 000000000..5c32c54da
--- /dev/null
+++ b/res/drawable-mdpi/ic_setting_icn.png
diff --git a/res/drawable-mdpi/ic_wallpaper.png b/res/drawable-mdpi/ic_wallpaper.png
new file mode 100644
index 000000000..333a206e2
--- /dev/null
+++ b/res/drawable-mdpi/ic_wallpaper.png
diff --git a/res/drawable-mdpi/ic_widget.png b/res/drawable-mdpi/ic_widget.png
new file mode 100644
index 000000000..5f974c28c
--- /dev/null
+++ b/res/drawable-mdpi/ic_widget.png
diff --git a/res/drawable-mdpi/screenpanel.9.png b/res/drawable-mdpi/screenpanel.9.png
new file mode 100644
index 000000000..4de3017f5
--- /dev/null
+++ b/res/drawable-mdpi/screenpanel.9.png
diff --git a/res/drawable-mdpi/screenpanel_hover.9.png b/res/drawable-mdpi/screenpanel_hover.9.png
new file mode 100644
index 000000000..dd7740665
--- /dev/null
+++ b/res/drawable-mdpi/screenpanel_hover.9.png
diff --git a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index 3f8eaf597..000000000
--- a/res/drawable-xhdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index 738cd2a9c..000000000
--- a/res/drawable-xhdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_gel_setting_icn.png b/res/drawable-xhdpi/ic_gel_setting_icn.png
deleted file mode 100644
index fe17163b1..000000000
--- a/res/drawable-xhdpi/ic_gel_setting_icn.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xhdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index d9472d981..000000000
--- a/res/drawable-xhdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_gel_widget_icn.png b/res/drawable-xhdpi/ic_gel_widget_icn.png
deleted file mode 100644
index da6e3e9c2..000000000
--- a/res/drawable-xhdpi/ic_gel_widget_icn.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_setting.png b/res/drawable-xhdpi/ic_setting.png
new file mode 100644
index 000000000..91ba98c55
--- /dev/null
+++ b/res/drawable-xhdpi/ic_setting.png
diff --git a/res/drawable-xhdpi/ic_wallpaper.png b/res/drawable-xhdpi/ic_wallpaper.png
new file mode 100644
index 000000000..41dc000fd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wallpaper.png
diff --git a/res/drawable-xhdpi/ic_widget.png b/res/drawable-xhdpi/ic_widget.png
new file mode 100644
index 000000000..47dcdd14f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_widget.png
diff --git a/res/drawable-xhdpi/screenpanel.9.png b/res/drawable-xhdpi/screenpanel.9.png
new file mode 100644
index 000000000..b4b828d3e
--- /dev/null
+++ b/res/drawable-xhdpi/screenpanel.9.png
diff --git a/res/drawable-xhdpi/screenpanel_hover.9.png b/res/drawable-xhdpi/screenpanel_hover.9.png
new file mode 100644
index 000000000..a44dc113f
--- /dev/null
+++ b/res/drawable-xhdpi/screenpanel_hover.9.png
diff --git a/res/drawable-xxhdpi/homescreen_blue_normal_holo.9.png b/res/drawable-xxhdpi/homescreen_blue_normal_holo.9.png
deleted file mode 100644
index 040748a49..000000000
--- a/res/drawable-xxhdpi/homescreen_blue_normal_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/homescreen_blue_strong_holo.9.png b/res/drawable-xxhdpi/homescreen_blue_strong_holo.9.png
deleted file mode 100644
index b75b3221b..000000000
--- a/res/drawable-xxhdpi/homescreen_blue_strong_holo.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_gel_setting_icn.png b/res/drawable-xxhdpi/ic_gel_setting_icn.png
deleted file mode 100644
index 813716def..000000000
--- a/res/drawable-xxhdpi/ic_gel_setting_icn.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png b/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png
deleted file mode 100644
index 352544606..000000000
--- a/res/drawable-xxhdpi/ic_gel_wallpaper_icn.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_gel_widget_icn.png b/res/drawable-xxhdpi/ic_gel_widget_icn.png
deleted file mode 100644
index 934243706..000000000
--- a/res/drawable-xxhdpi/ic_gel_widget_icn.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_setting.png b/res/drawable-xxhdpi/ic_setting.png
new file mode 100644
index 000000000..6e1e6627c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_setting.png
diff --git a/res/drawable-xxhdpi/ic_wallpaper.png b/res/drawable-xxhdpi/ic_wallpaper.png
new file mode 100644
index 000000000..c71844410
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wallpaper.png
diff --git a/res/drawable-xxhdpi/ic_widget.png b/res/drawable-xxhdpi/ic_widget.png
new file mode 100644
index 000000000..fddfecaa3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_widget.png
diff --git a/res/drawable-xxhdpi/screenpanel.9.png b/res/drawable-xxhdpi/screenpanel.9.png
new file mode 100644
index 000000000..c44f3b898
--- /dev/null
+++ b/res/drawable-xxhdpi/screenpanel.9.png
diff --git a/res/drawable-xxhdpi/screenpanel_hover.9.png b/res/drawable-xxhdpi/screenpanel_hover.9.png
new file mode 100644
index 000000000..1ab18da6a
--- /dev/null
+++ b/res/drawable-xxhdpi/screenpanel_hover.9.png
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index e4f4c8960..751579324 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -22,24 +22,30 @@
     android:paddingBottom="@dimen/overview_panel_bottom_padding">
 
     <TextView
-        android:id="@+id/widget_button"
+        android:id="@+id/wallpaper_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/widget_button_text"
+        android:text="@string/wallpaper_button_text"
         android:drawablePadding="4dp"
-        android:drawableTop="@drawable/ic_gel_widget_icn"
-        android:textSize="18dp"/>
+        android:drawableTop="@drawable/ic_wallpaper"
+        android:gravity="center_horizontal"
+        android:fontFamily="sans-serif-condensed"
+        android:textAllCaps="true"
+        android:textSize="12sp" />
     <Space
         android:layout_width="@dimen/overview_panel_buttonSpacing"
         android:layout_height="wrap_content"/>
     <TextView
-        android:id="@+id/wallpaper_button"
+        android:id="@+id/widget_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/wallpaper_button_text"
+        android:text="@string/widget_button_text"
         android:drawablePadding="4dp"
-        android:drawableTop="@drawable/ic_gel_wallpaper_icn"
-        android:textSize="18dp" />
+        android:gravity="center_horizontal"
+        android:drawableTop="@drawable/ic_widget"
+        android:fontFamily="sans-serif-condensed"
+        android:textAllCaps="true"
+        android:textSize="12sp"/>
     <Space
         android:layout_width="@dimen/overview_panel_buttonSpacing"
         android:layout_height="wrap_content"/>
@@ -49,6 +55,9 @@
         android:layout_height="wrap_content"
         android:text="@string/settings_button_text"
         android:drawablePadding="4dp"
-        android:drawableTop="@drawable/ic_gel_setting_icn"
-        android:textSize="18dp" />
+        android:gravity="center_horizontal"
+        android:drawableTop="@drawable/ic_setting"
+        android:fontFamily="sans-serif-condensed"
+        android:textAllCaps="true"
+        android:textSize="12sp" />
 </LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6b9221c33..48a06fc7d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -34,4 +34,5 @@
     <color name="apps_customize_icon_text_color">#FFF</color>
     <color name="wallpaper_picker_translucent_gray">#66000000</color>
     <color name="folder_items_text_color">#FF333333</color>
+    <color name="outline_color">#FFFFFFFF</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 202764028..fa84b9bc6 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,7 +17,7 @@
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
     <integer name="config_workspaceSpringLoadShrinkPercentage">80</integer>
     <!-- Out of 100, the percent to shrink the workspace during overview mode. -->
-    <integer name="config_workspaceOverviewShrinkPercentage">50</integer>
+    <integer name="config_workspaceOverviewShrinkPercentage">58</integer>
 
     <!-- Fade/zoom in/out duration & scale in the AllApps transition.
          Note: This should be less than the workspaceShrinkTime as they happen together. -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7a1a7aaf8..2910b7c7c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,7 +41,8 @@
     <dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
     <dimen name="workspace_spring_loaded_page_spacing">15dp</dimen>
     <dimen name="overview_panel_bottom_padding">50dp</dimen>
-    <dimen name="overview_panel_buttonSpacing">40dp</dimen>
+    <dimen name="overview_panel_buttonSpacing">60dp</dimen>
+    <dimen name="overview_mode_page_offset">130dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">4dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8406302c1..6c05f7d29 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -284,9 +284,9 @@ s -->
 
     <!-- Strings for the customization mode -->
     <!-- Text for widget add button -->
-    <string name="widget_button_text">Add Widget</string>
+    <string name="widget_button_text">Widgets</string>
     <!-- Text for wallpaper change button -->
-    <string name="wallpaper_button_text">Wallpaper</string>
+    <string name="wallpaper_button_text">Wallpapers</string>
     <!-- Text for settings button -->
     <string name="settings_button_text">Settings</string>
 </resources>