Initial Changes for Dynamic Grid

Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf

3 files changed, 0 insertions, 60 deletions

diff --git a/res/values-land/config.xml b/res/values-land/config.xml
index da9f9f982..121bb0c14 100644
--- a/res/values-land/config.xml
+++ b/res/values-land/config.xml
@@ -20,11 +20,4 @@
     <bool name="config_useDropTargetDownTransition">false</bool>
     <!-- Whether or not to fade the side pages -->
     <bool name="config_workspaceFadeAdjacentScreens">false</bool>
-
-    <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
-         >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
-         A value of -1 indicates unbounded -->
-    <integer name="folder_max_count_x">6</integer>
-    <integer name="folder_max_count_y">-1</integer>
-    <integer name="folder_max_num_items">-1</integer>
 </resources>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 5edd14364..4d94d7e62 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -20,39 +20,9 @@
     <dimen name="toolbar_button_horizontal_padding">0dip</dimen>
 
 <!-- Workspace -->
-    <dimen name="hotseat_cell_width">64dp</dimen>
-    <dimen name="hotseat_cell_height">58dp</dimen>
     <!-- We really want the page spacing to be the max of either the button bar
      height or the qsb bar height -->
     <dimen name="workspace_page_spacing">-1dp</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>
-
-    <!-- Block spacing on each side of the screen.  And also padding
-         for the portals to look right. -->
-    <dimen name="cell_layout_left_padding">@dimen/cell_layout_left_padding_land</dimen>
-    <dimen name="cell_layout_right_padding">@dimen/cell_layout_right_padding_land</dimen>
-    <dimen name="cell_layout_top_padding">@dimen/cell_layout_top_padding_land</dimen>
-    <dimen name="cell_layout_bottom_padding">@dimen/cell_layout_bottom_padding_land</dimen>
-    <!-- Workspace padding -->
-    <dimen name="workspace_left_padding">@dimen/workspace_left_padding_land</dimen>
-    <dimen name="workspace_right_padding">@dimen/workspace_right_padding_land</dimen>
-    <dimen name="workspace_top_padding">@dimen/workspace_top_padding_land</dimen>
-    <dimen name="workspace_bottom_padding">@dimen/workspace_bottom_padding_land</dimen>
-
-    <dimen name="app_icon_padding_top">6dp</dimen>
-
-    <!-- height of the bottom row of controls -->
-    <dimen name="button_bar_height">68dip</dimen>
-    <!-- Because portal animations go beyond the bounds of an icon, we need
-         to make the dock layout slightly larger than the button_bar_height -->
-    <dimen name="button_bar_height_top_padding">8dp</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">76dp</dimen>
 
 <!-- AppsCustomize -->
     <dimen name="apps_customize_cell_width">80dp</dimen>
@@ -71,14 +41,4 @@
     <integer name="apps_customize_widget_cell_count_y">2</integer>
     <integer name="apps_customize_cling_focused_x">2</integer>
     <integer name="apps_customize_cling_focused_y">1</integer>
-
-<!-- Folders -->
-    <!-- The size of the image which sits behind the preview of the folder contents -->
-    <dimen name="folder_preview_size">58dp</dimen>
-
-<!-- Workspace cell size -->
-    <dimen name="workspace_cell_width">@dimen/workspace_cell_width_land</dimen>
-    <dimen name="workspace_cell_height">@dimen/workspace_cell_height_land</dimen>
-    <dimen name="workspace_width_gap">@dimen/workspace_width_gap_land</dimen>
-    <dimen name="workspace_height_gap">@dimen/workspace_height_gap_land</dimen>
 </resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 6c9fd504e..ccb5fcb06 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -20,23 +20,10 @@
 <resources>
 <!-- Search Bar -->
     <style name="QSBBar">
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_width">@dimen/qsb_bar_height</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_gravity">start</item>
     </style>
     <style name="SearchDropTargetBar">
-        <item name="android:orientation">vertical</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center_horizontal</item>
     </style>
     <style name="SearchButton">
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item>
-        <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item>
-        <item name="android:paddingStart">@dimen/toolbar_button_horizontal_padding</item>
-        <item name="android:paddingEnd">@dimen/toolbar_button_horizontal_padding</item>
     </style>
     <style name="DropTargetButtonContainer">
         <item name="android:layout_width">match_parent</item>