From 0e721a4005b4d119cf641ca0dd0d8744672646f0 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 2 Aug 2012 17:40:30 -0700
Subject: Initial changes for new 10inch layout.

Change-Id: Ifaafca469df626a76ab5e16bd2f0d5afa1da172c
---
 res/values-sw720dp/config.xml |  5 ++++
 res/values-sw720dp/dimens.xml | 70 +++++++++++++++++++++++++++----------------
 res/values-sw720dp/styles.xml | 15 +++-------
 3 files changed, 54 insertions(+), 36 deletions(-)

(limited to 'res/values-sw720dp')

diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index cdca8050e..1913d7482 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -1,4 +1,6 @@
 <resources>
+    <integer name="cell_count_x">8</integer>
+    <integer name="cell_count_y">5</integer>
     <bool name="config_largeHeap">true</bool>
     <bool name="is_large_screen">true</bool>
 
@@ -14,4 +16,7 @@
 
     <!-- Camera distance for the overscroll effect -->
     <integer name="config_cameraDistance">6500</integer>
+
+<!-- Hotseat -->
+    <bool name="hotseat_transpose_layout_with_orientation">false</bool>
 </resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 4750ae29c..9d73eca4a 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -17,19 +17,29 @@
 <resources>
     <dimen name="app_icon_size">72dp</dimen>
     <dimen name="reveal_radius">72dp</dimen>
+
+<!-- Hotseat -->
+    <dimen name="button_bar_height">96dp</dimen>
+    <dimen name="button_bar_height_top_padding">0dp</dimen>
+    <dimen name="button_bar_height_bottom_padding">0dp</dimen>
+    <dimen name="button_bar_width_left_padding">0dp</dimen>
+    <dimen name="button_bar_width_right_padding">0dp</dimen>
+    <dimen name="button_bar_height_plus_padding">96dp</dimen>
+    <dimen name="hotseat_width_gap">48dp</dimen>
+
 <!-- QSB -->
-    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">12dip</dimen>
+    <dimen name="toolbar_button_vertical_padding">8dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
 <!-- Workspace -->
-    <dimen name="qsb_bar_height">56dp</dimen>
-    <dimen name="qsb_bar_height_inset">37dp</dimen>
-    <dimen name="qsb_padding_left">0dp</dimen>
-    <dimen name="qsb_padding_right">0dp</dimen>
-    <dimen name="search_bar_height">40dp</dimen>
-    <!-- This should be @dimen/qsb_bar_height - @dimen/workspace_top_padding
-         to fix the extra space given to draw portals -->
-    <dimen name="workspace_content_large_only_top_margin">36dp</dimen>
+    <dimen name="qsb_bar_height">60dp</dimen>
+    <dimen name="qsb_bar_height_inset">60dp</dimen>
+    <dimen name="qsb_padding_left">249dp</dimen>
+    <dimen name="qsb_padding_right">249dp</dimen>
+    <!-- We offset the proxy to overlap with the voice icon -->
+    <dimen name="qsb_voice_proxy_padding_right">230dp</dimen>
+    <!-- 44dp high for the optical bounds -->
+    <dimen name="search_bar_height">52dp</dimen>
 
     <dimen name="folder_cell_width">96dp</dimen>
     <dimen name="folder_cell_height">96dp</dimen>
@@ -52,32 +62,42 @@
     <dimen name="dragViewOffsetY">0dp</dimen>
 
 <!-- CellLayout padding land / port-->
-    <dimen name="cell_layout_left_padding_port">15dp</dimen>
-    <dimen name="cell_layout_left_padding_land">24dp</dimen>
-    <dimen name="cell_layout_right_padding_port">15dp</dimen>
-    <dimen name="cell_layout_right_padding_land">24dp</dimen>
-    <dimen name="cell_layout_top_padding_port">25dp</dimen>
-    <dimen name="cell_layout_top_padding_land">12dp</dimen>
-    <dimen name="cell_layout_bottom_padding_port">25dp</dimen>
-    <dimen name="cell_layout_bottom_padding_land">12dp</dimen>
+    <dimen name="cell_layout_left_padding_port">0dp</dimen>
+    <dimen name="cell_layout_left_padding_land">0dp</dimen>
+    <dimen name="cell_layout_right_padding_port">0dp</dimen>
+    <dimen name="cell_layout_right_padding_land">0dp</dimen>
+    <dimen name="cell_layout_top_padding_port">0dp</dimen>
+    <dimen name="cell_layout_top_padding_land">0dp</dimen>
+    <dimen name="cell_layout_bottom_padding_port">0dp</dimen>
+    <dimen name="cell_layout_bottom_padding_land">0dp</dimen>
 
 <!-- Workspace padding -->
     <dimen name="workspace_left_padding_port">0dp</dimen>
     <dimen name="workspace_left_padding_land">0dp</dimen>
     <dimen name="workspace_right_padding_port">0dp</dimen>
     <dimen name="workspace_right_padding_land">0dp</dimen>
-    <dimen name="workspace_top_padding_port">@dimen/workspace_content_large_only_top_margin</dimen>
-    <dimen name="workspace_top_padding_land">@dimen/workspace_content_large_only_top_margin</dimen>
-    <dimen name="workspace_bottom_padding_port">0dp</dimen>
-    <dimen name="workspace_bottom_padding_land">0dp</dimen>
+
+    <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen>
+    <dimen name="workspace_top_padding_land">@dimen/qsb_bar_height_inset</dimen>
+    <!-- XXX: This should be @dimen/button_bar_height + bottom padding, but because we are not using
+              the hotseat with the smaller icons, this is slightly larger than final dimensions. -->
+    <dimen name="workspace_bottom_padding_port">110dp</dimen>
+    <dimen name="workspace_bottom_padding_land">100dp</dimen>
+
+    <!-- Page width set to match a page of icons (96*k + 46*(k-1) - 2*12[icon padding]) -->
+    <dimen name="workspace_divider_width">1066dp</dimen>
+    <dimen name="workspace_divider_padding_left">0dp</dimen>
+    <dimen name="workspace_divider_padding_right">0dp</dimen>
+    <dimen name="workspace_divider_padding_top">0dp</dimen>
+    <dimen name="workspace_divider_padding_bottom">0dp</dimen>
 
 <!-- Workspace cell size -->
     <dimen name="workspace_cell_width_land">96dp</dimen>
     <dimen name="workspace_cell_width_port">96dp</dimen>
     <dimen name="workspace_cell_height_land">96dp</dimen>
     <dimen name="workspace_cell_height_port">96dp</dimen>
-    <dimen name="workspace_width_gap_land">32dp</dimen>
+    <dimen name="workspace_width_gap_land">46dp</dimen>
     <dimen name="workspace_width_gap_port">0dp</dimen>
-    <dimen name="workspace_height_gap_land">2dp</dimen>
-    <dimen name="workspace_height_gap_port">32dp</dimen>
+    <dimen name="workspace_height_gap_land">16dp</dimen>
+    <dimen name="workspace_height_gap_port">48dp</dimen>
 </resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 87110da9f..d4b43442f 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -75,6 +75,7 @@
         <item name="android:paddingTop">@dimen/app_icon_padding_top</item>
         <item name="android:paddingBottom">4dp</item>
         <item name="android:textSize">13sp</item>
+        <item name="android:background">#FFFF0000</item>
     </style>
     <style name="WorkspaceIcon.Landscape.Folder">
         <item name="android:drawablePadding">0dp</item>
@@ -123,27 +124,19 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/qsb_bar_height</item>
         <item name="android:layout_gravity">top|center_horizontal</item>
+        <item name="android:paddingLeft">@dimen/qsb_padding_left</item>
+        <item name="android:paddingRight">@dimen/qsb_padding_right</item>
     </style>
     <style name="SearchDropTargetBar">
         <item name="android:orientation">horizontal</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
+        <item name="android:layout_gravity">bottom|center_horizontal</item>
     </style>
     <style name="SearchButton">
         <item name="android:layout_gravity">center_vertical</item>
         <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
         <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
-        <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item>
-        <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item>
-    </style>
-    <style name="SearchButton.Voice">
-        <item name="android:paddingLeft">18dp</item>
-        <item name="android:paddingRight">18dp</item>
-    </style>
-    <style name="SearchButtonDivider">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_gravity">center_vertical</item>
     </style>
     <style name="DropTargetButtonContainer">
         <item name="android:layout_width">0dp</item>
-- 
cgit v1.2.3