diff options
| -rw-r--r-- | res/values-port/dimens.xml | 6 | ||||
| -rw-r--r-- | res/values-sw340dp-port/dimens.xml | 5 | ||||
| -rw-r--r-- | res/values-sw340dp-port/styles.xml | 8 | ||||
| -rw-r--r-- | res/values/dimens.xml | 12 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
5 files changed, 20 insertions, 13 deletions
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml index 83f2d606c..799742f21 100644 --- a/res/values-port/dimens.xml +++ b/res/values-port/dimens.xml @@ -15,6 +15,12 @@ --> <resources> +<!-- QSB --> + <dimen name="qsb_bar_height_inset">37dp</dimen> + <dimen name="qsb_bar_height">43dp</dimen> + <dimen name="qsb_padding_left">3dp</dimen> + <dimen name="qsb_padding_right">3dp</dimen> + <!-- Workspace --> <dimen name="workspace_left_padding">0dp</dimen> <dimen name="workspace_right_padding">0dp</dimen> diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml index dd485e3b2..ef4491316 100644 --- a/res/values-sw340dp-port/dimens.xml +++ b/res/values-sw340dp-port/dimens.xml @@ -39,6 +39,8 @@ that we put on each page for allowing folders to draw out of bounds --> <dimen name="qsb_bar_height_inset">48dp</dimen> <dimen name="qsb_bar_height">54dp</dimen> + <dimen name="qsb_padding_left">6dp</dimen> + <dimen name="qsb_padding_right">6dp</dimen> <dimen name="search_bar_height">48dp</dimen> <!-- height of the bottom row of controls --> <dimen name="button_bar_height">80dip</dimen> @@ -57,4 +59,7 @@ <dimen name="apps_customize_pageLayoutPaddingRight">8dp</dimen> <dimen name="apps_customize_cell_height">92dp</dimen> <dimen name="apps_customize_widget_cell_height_gap">16dp</dimen> + +<!-- Folders --> + <dimen name="folder_preview_size">64dp</dimen> </resources> diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml index 2b1376d15..9a4224988 100644 --- a/res/values-sw340dp-port/styles.xml +++ b/res/values-sw340dp-port/styles.xml @@ -19,14 +19,6 @@ <resources> <!-- Workspace --> - <style name="QSBBar"> - <item name="android:orientation">horizontal</item> - <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/workspace_divider_padding_left</item> - <item name="android:paddingRight">@dimen/workspace_divider_padding_right</item> - </style> <style name="SearchButton"> <item name="android:layout_gravity">center_vertical</item> <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9ba77a98a..967ef66f0 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -24,6 +24,8 @@ 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_cell_width">80dp</dimen> <dimen name="workspace_cell_height">100dp</dimen> @@ -32,8 +34,8 @@ <dimen name="workspace_max_gap">16dp</dimen> <dimen name="folder_cell_width">74dp</dimen> <dimen name="folder_cell_height">82dp</dimen> - <dimen name="workspace_divider_padding_left">12dp</dimen> - <dimen name="workspace_divider_padding_right">12dp</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> @@ -65,14 +67,14 @@ <dimen name="title_texture_width">120px</dimen> <!-- height of the bottom row of controls --> - <dimen name="button_bar_height">64dip</dimen> + <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">72dp</dimen> + <dimen name="button_bar_height_plus_padding">70dp</dimen> <!-- Drag padding to add to the drop targets --> <dimen name="drop_target_drag_padding">40dp</dimen> @@ -113,7 +115,7 @@ <!-- Folders --> <!-- The size of the image which sits behind the preview of the folder contents --> - <dimen name="folder_preview_size">64dp</dimen> + <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> diff --git a/res/values/styles.xml b/res/values/styles.xml index 981d5bef5..e38c395c0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -117,6 +117,8 @@ <item name="android:layout_height">@dimen/qsb_bar_height</item> <item name="android:layout_gravity">top|center_horizontal</item> <item name="android:background">@drawable/search_bg_panel</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> |