diff options
author | Jon Miranda <jonmiranda@google.com> | 2017-06-20 10:58:36 -0700 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2017-06-23 11:47:48 -0700 |
commit | b28c4fcf351dc9f44f69253b227880758f6b460c (patch) | |
tree | 1a75f63300be881006ab64d5d39ef0b815826d85 /res/values | |
parent | a9d721df781bf4d195eb52bba1f9a3193f7eaad4 (diff) | |
download | android_packages_apps_Trebuchet-b28c4fcf351dc9f44f69253b227880758f6b460c.tar.gz android_packages_apps_Trebuchet-b28c4fcf351dc9f44f69253b227880758f6b460c.tar.bz2 android_packages_apps_Trebuchet-b28c4fcf351dc9f44f69253b227880758f6b460c.zip |
Landscape grid changes for Workspace/All Apps.
This is the just first CL to get eyes on the changes.
Next CL will update the All Apps to be full width.
Bug: 37015359
Change-Id: I2d7ec6851fdc13b8fa654e7e2be3152330243ccc
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 4 | ||||
-rw-r--r-- | res/values/dimens.xml | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 27992ceb6..87597b9f2 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -111,9 +111,9 @@ <attr name="numHotseatIcons" format="integer" /> <attr name="iconSize" format="float" /> + <!-- landscapeIconSize defaults to iconSize, if not specified --> + <attr name="landscapeIconSize" format="float" /> <attr name="iconTextSize" format="float" /> - <!-- hotseatIconSize defaults to iconSize, if not specified --> - <attr name="hotseatIconSize" format="float" /> <attr name="defaultLayoutId" format="reference" /> </declare-styleable> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b90de82c1..71f9edc91 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -17,10 +17,9 @@ <resources> <!-- Dynamic Grid --> <dimen name="dynamic_grid_edge_margin">16dp</dimen> - <dimen name="dynamic_grid_page_indicator_height">32dp</dimen> + <dimen name="dynamic_grid_page_indicator_size">32dp</dimen> <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen> - <dimen name="dynamic_grid_page_indicator_gutter_width_left_nav_bar">38dp</dimen> - <dimen name="dynamic_grid_page_indicator_gutter_width_right_nav_bar">48dp</dimen> + <dimen name="dynamic_grid_page_indicator_gutter_width">50dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen> <dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen> <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen> @@ -38,7 +37,10 @@ <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen> <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen> <dimen name="dynamic_grid_hotseat_height">80dp</dimen> - <dimen name="dynamic_grid_hotseat_land_gutter_width">24dp</dimen> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_right_padding">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_gutter_width">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_gutter_width">0dp</dimen> <!-- Drop target bar --> <dimen name="dynamic_grid_drop_target_size">48dp</dimen> @@ -74,7 +76,7 @@ <dimen name="all_apps_caret_stroke_width">2dp</dimen> <dimen name="all_apps_caret_shadow_spread">1dp</dimen> <dimen name="all_apps_caret_size">13dp</dimen> - <dimen name="all_apps_caret_workspace_offset">4dp</dimen> + <dimen name="all_apps_caret_workspace_offset">18dp</dimen> <!-- Search bar in All Apps --> <dimen name="all_apps_header_max_elevation">3dp</dimen> |