Initial Changes for Dynamic Grid
Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 13a15e3..6e24481 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -15,48 +15,30 @@
-->
<resources>
+<!-- Dynamic Grid -->
+ <dimen name="dynamic_grid_edge_margin">6dp</dimen>
+ <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>
+ <dimen name="dynamic_grid_search_bar_height">48dp</dimen>
+ <dimen name="dynamic_grid_page_indicator_height">24dp</dimen>
+
<!-- Cling -->
<dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen>
<dimen name="folderClingMarginTop">20dp</dimen>
<!-- The offset for the text in the cling -->
<dimen name="cling_text_block_offset_x">0dp</dimen>
<dimen name="cling_text_block_offset_y">0dp</dimen>
- <dimen name="reveal_radius">48dp</dimen>
<!-- entries for custom clings, will be set in overlays -->
<add-resource type="dimen" name="custom_cling_margin_top" />
<add-resource type="dimen" name="custom_cling_margin_right" />
<add-resource type="dimen" name="custom_cling_margin_left" />
<!-- Workspace -->
- <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
- that we put on each page for allowing folders to draw out of bounds -->
- <dimen name="qsb_bar_height_inset">34dp</dimen>
- <dimen name="qsb_bar_height">40dp</dimen>
- <dimen name="qsb_padding_left">0dp</dimen>
- <dimen name="qsb_padding_right">0dp</dimen>
- <dimen name="search_bar_height">40dp</dimen>
<dimen name="workspace_max_gap">16dp</dimen>
- <dimen name="folder_cell_width">74dp</dimen>
- <dimen name="folder_cell_height">82dp</dimen>
- <dimen name="folder_icon_padding_top">2dp</dimen>
- <dimen name="workspace_divider_padding_left">3dp</dimen>
- <dimen name="workspace_divider_padding_right">3dp</dimen>
- <dimen name="workspace_divider_padding_top">0dp</dimen>
- <dimen name="workspace_divider_padding_bottom">0dp</dimen>
- <dimen name="hotseat_cell_width">64dp</dimen>
- <dimen name="hotseat_cell_height">64dp</dimen>
- <dimen name="hotseat_width_gap">-1dp</dimen>
- <dimen name="hotseat_height_gap">-1dp</dimen>
<dimen name="workspace_overscroll_drawable_padding">0dp</dimen>
- <dimen name="workspace_icon_text_size">12sp</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="app_icon_drawable_padding">6dp</dimen>
- <dimen name="app_icon_drawable_padding_land">2dp</dimen>
- <dimen name="app_icon_padding_top">8dp</dimen>
-
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">4dip</dimen>
<dimen name="toolbar_button_horizontal_padding">12dip</dimen>
@@ -83,16 +65,6 @@
<dimen name="apps_customize_page_indicator_height">12dp</dimen>
<dimen name="apps_customize_page_indicator_margin">4dp</dimen>
- <!-- height of the bottom row of controls -->
- <dimen name="button_bar_height">62dip</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">70dp</dimen>
-
<!-- Drag padding to add to the bottom of drop targets -->
<dimen name="drop_target_drag_padding">14dp</dimen>
@@ -123,42 +95,7 @@
<dimen name="shortcut_preview_padding_top">0dp</dimen>
<!-- Folders -->
- <!-- The size of the image which sits behind the preview of the folder contents -->
- <dimen name="folder_preview_size">62dp</dimen>
<!-- The amount that the preview contents are inset from the preview background -->
<dimen name="folder_preview_padding">4dp</dimen>
<dimen name="folder_name_padding">10dp</dimen>
- <dimen name="folder_width_gap">0dp</dimen>
- <dimen name="folder_height_gap">0dp</dimen>
- <dimen name="folder_padding">0dp</dimen>
-
-<!-- CellLayout padding -->
- <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">6dp</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">@dimen/qsb_bar_height</dimen>
- <dimen name="workspace_right_padding_port">0dp</dimen>
- <dimen name="workspace_right_padding_land">@dimen/button_bar_height</dimen>
- <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen>
- <dimen name="workspace_top_padding_land">0dp</dimen>
- <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height</dimen>
- <dimen name="workspace_bottom_padding_land">0dp</dimen>
-
-<!-- Workspace cell size -->
- <dimen name="workspace_cell_width_land">106dp</dimen>
- <dimen name="workspace_cell_width_port">80dp</dimen>
- <dimen name="workspace_cell_height_land">74dp</dimen>
- <dimen name="workspace_cell_height_port">100dp</dimen>
- <dimen name="workspace_width_gap_land">0dp</dimen>
- <dimen name="workspace_width_gap_port">0dp</dimen>
- <dimen name="workspace_height_gap_land">0dp</dimen>
- <dimen name="workspace_height_gap_port">0dp</dimen>
</resources>