diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-23 18:59:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-23 18:59:12 +0000 |
| commit | 6828cbb7515eeaccd96f481232e252b9bc47d512 (patch) | |
| tree | a9a2f94609945c9f7751d32b363787fe6a34b871 /res/values | |
| parent | 9314b7c01d932093c730dd39b9b9842d1a56efdb (diff) | |
| parent | b28c4fcf351dc9f44f69253b227880758f6b460c (diff) | |
| download | android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.gz android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.bz2 android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.zip | |
Merge "Landscape grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish
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 05e66ad91..7929e65d1 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -116,9 +116,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> |