diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/values-land/dimens.xml | 8 | ||||
-rw-r--r-- | res/values-port/dimens.xml | 6 | ||||
-rw-r--r-- | res/values-sw340dp/dimens.xml | 26 | ||||
-rw-r--r-- | res/values-sw600dp-land/dimens.xml | 6 | ||||
-rw-r--r-- | res/values-sw600dp-port/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 15 | ||||
-rw-r--r-- | res/values-sw720dp-land/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-sw720dp-port/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 28 | ||||
-rw-r--r-- | res/values/dimens.xml | 13 |
10 files changed, 64 insertions, 44 deletions
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 69d68be93..e94d78064 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -20,8 +20,6 @@ <dimen name="toolbar_button_horizontal_padding">4dip</dimen> <!-- Workspace --> - <dimen name="workspace_cell_width">106dp</dimen> - <dimen name="workspace_cell_height">74dp</dimen> <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 @@ -77,4 +75,10 @@ <!-- 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-port/dimens.xml b/res/values-port/dimens.xml index 193f331b3..969d3358a 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -50,4 +50,10 @@ <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen> <integer name="apps_customize_widget_cell_count_x">2</integer> <integer name="apps_customize_widget_cell_count_y">3</integer> + +<!-- Workspace cell size --> + <dimen name="workspace_cell_width">@dimen/workspace_cell_width_port</dimen> + <dimen name="workspace_cell_height">@dimen/workspace_cell_height_port</dimen> + <dimen name="workspace_width_gap">@dimen/workspace_width_gap_port</dimen> + <dimen name="workspace_height_gap">@dimen/workspace_height_gap_port</dimen> </resources> diff --git a/res/values-sw340dp/dimens.xml b/res/values-sw340dp/dimens.xml index 8f5a3678b..42fbb47ce 100644 --- a/res/values-sw340dp/dimens.xml +++ b/res/values-sw340dp/dimens.xml @@ -18,10 +18,6 @@ <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">20dp</dimen> -<!-- Workspace --> - <dimen name="workspace_width_gap">0dp</dimen> - <dimen name="workspace_height_gap">0dp</dimen> - <!-- Hotseat --> <dimen name="hotseat_width_gap">0dp</dimen> <dimen name="hotseat_height_gap">0dp</dimen> @@ -35,12 +31,18 @@ <dimen name="button_bar_height_plus_padding">80dp</dimen> <!-- CellLayout padding land / port--> - <dimen name="cell_layout_left_padding_portrait">8dp</dimen> - <dimen name="cell_layout_left_padding_landscape">8dp</dimen> - <dimen name="cell_layout_right_padding_portrait">8dp</dimen> - <dimen name="cell_layout_right_padding_landscape">8dp</dimen> - <dimen name="cell_layout_top_padding_portrait">8dp</dimen> - <dimen name="cell_layout_top_padding_landscape">8dp</dimen> - <dimen name="cell_layout_bottom_padding_portrait">8dp</dimen> - <dimen name="cell_layout_bottom_padding_landscape">8dp</dimen> + <dimen name="cell_layout_left_padding_port">8dp</dimen> + <dimen name="cell_layout_left_padding_land">8dp</dimen> + <dimen name="cell_layout_right_padding_port">8dp</dimen> + <dimen name="cell_layout_right_padding_land">8dp</dimen> + <dimen name="cell_layout_top_padding_port">8dp</dimen> + <dimen name="cell_layout_top_padding_land">8dp</dimen> + <dimen name="cell_layout_bottom_padding_port">8dp</dimen> + <dimen name="cell_layout_bottom_padding_land">8dp</dimen> + +<!-- Workspace cell size --> + <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> diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 7db0a8adb..3e1841748 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -22,12 +22,6 @@ <!-- Hotseat --> <dimen name="hotseat_cell_width">75dp</dimen> <dimen name="hotseat_cell_height">75dp</dimen> - -<!-- Workspace --> - <dimen name="workspace_cell_width">96dp</dimen> - <dimen name="workspace_cell_height">86dp</dimen> - <dimen name="workspace_width_gap">32dp</dimen> - <dimen name="workspace_height_gap">0dp</dimen> <dimen name="workspace_icon_text_size">11sp</dimen> <!-- Folders --> diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml index 956599248..c8137251e 100644 --- a/res/values-sw600dp-port/dimens.xml +++ b/res/values-sw600dp-port/dimens.xml @@ -17,8 +17,6 @@ <resources> <!-- Workspace --> <integer name="app_icon_scale_percent">-1</integer> - <dimen name="workspace_width_gap">0dp</dimen> - <dimen name="workspace_height_gap">32dp</dimen> <!-- AppsCustomize --> <dimen name="apps_customize_cell_width">96dp</dimen> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index a0d7ec86f..07976323b 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -20,10 +20,6 @@ <dimen name="app_icon_drawable_padding">3dp</dimen> <dimen name="app_icon_padding_top">4dp</dimen> -<!-- Workspace --> - <dimen name="workspace_cell_width">96dp</dimen> - <dimen name="workspace_cell_height">96dp</dimen> - <!-- Hotseat --> <dimen name="hotseat_width_gap">-1dp</dimen> <dimen name="hotseat_height_gap">-1dp</dimen> @@ -50,4 +46,15 @@ <dimen name="apps_customize_tab_bar_margin_top">8dp</dimen> <dimen name="apps_customize_widget_cell_width_gap">36dp</dimen> <dimen name="apps_customize_widget_cell_height_gap">36dp</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">86dp</dimen> + <dimen name="workspace_cell_height_port">96dp</dimen> + <dimen name="workspace_width_gap_land">32dp</dimen> + <dimen name="workspace_width_gap_port">0dp</dimen> + <dimen name="workspace_height_gap_land">0dp</dimen> + <dimen name="workspace_height_gap_port">32dp</dimen> + </resources> diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml index 2d39fc7ea..825245057 100644 --- a/res/values-sw720dp-land/dimens.xml +++ b/res/values-sw720dp-land/dimens.xml @@ -22,8 +22,6 @@ <dimen name="apps_customize_pageLayoutPaddingRight">16dp</dimen> <!-- Workspace --> - <dimen name="workspace_width_gap">32dp</dimen> - <dimen name="workspace_height_gap">2dp</dimen> <dimen name="workspace_page_spacing">50dp</dimen> <!-- the area at the edge of the screen that makes the workspace go left diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml index 9a0261bab..9cf37ffee 100644 --- a/res/values-sw720dp-port/dimens.xml +++ b/res/values-sw720dp-port/dimens.xml @@ -31,8 +31,6 @@ <!-- the area at the edge of the screen that makes the workspace go left or right while you're dragging. --> <dimen name="scroll_zone">40dp</dimen> - <dimen name="workspace_width_gap">0dp</dimen> - <dimen name="workspace_height_gap">32dp</dimen> <dimen name="workspace_page_spacing">24dp</dimen> <integer name="apps_customize_cling_focused_x">2</integer> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index dc1c65ad6..37f62b881 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -24,8 +24,6 @@ <!-- 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="workspace_cell_width">96dip</dimen> - <dimen name="workspace_cell_height">96dip</dimen> <dimen name="folder_cell_width">96dp</dimen> <dimen name="folder_cell_height">96dp</dimen> @@ -55,14 +53,14 @@ <dimen name="dragViewOffsetY">0dp</dimen> <!-- CellLayout padding land / port--> - <dimen name="cell_layout_left_padding_portrait">15dp</dimen> - <dimen name="cell_layout_left_padding_landscape">24dp</dimen> - <dimen name="cell_layout_right_padding_portrait">15dp</dimen> - <dimen name="cell_layout_right_padding_landscape">24dp</dimen> - <dimen name="cell_layout_top_padding_portrait">25dp</dimen> - <dimen name="cell_layout_top_padding_landscape">12dp</dimen> - <dimen name="cell_layout_bottom_padding_portrait">25dp</dimen> - <dimen name="cell_layout_bottom_padding_landscape">12dp</dimen> + <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> <!-- Workspace padding --> <dimen name="workspace_left_padding_port">0dp</dimen> @@ -73,4 +71,14 @@ <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> + +<!-- 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_port">0dp</dimen> + <dimen name="workspace_height_gap_land">2dp</dimen> + <dimen name="workspace_height_gap_port">32dp</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ff17ec4f4..d3b9c1e9b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -30,10 +30,6 @@ <dimen name="qsb_padding_left">0dp</dimen> <dimen name="qsb_padding_right">0dp</dimen> <dimen name="search_bar_height">40dp</dimen> - <dimen name="workspace_cell_width">80dp</dimen> - <dimen name="workspace_cell_height">100dp</dimen> - <dimen name="workspace_width_gap">-1dp</dimen> - <dimen name="workspace_height_gap">-1dp</dimen> <dimen name="workspace_max_gap">16dp</dimen> <dimen name="folder_cell_width">74dp</dimen> <dimen name="folder_cell_height">82dp</dimen> @@ -140,4 +136,13 @@ <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">-1dp</dimen> + <dimen name="workspace_width_gap_port">-1dp</dimen> + <dimen name="workspace_height_gap_land">-1dp</dimen> + <dimen name="workspace_height_gap_port">-1dp</dimen> </resources> |