Commit 08b2f2f5 authored by Peter Boström's avatar Peter Boström Committed by Commit Bot

Change spacing and corners for Material refresh

* Adds 2dips of bottom margin and 2dips of padding between items (for
  all layout modes).
* Uses 4dips of rounded-corner radius under Refresh (already in use
  under touchable).

Bug: chromium:822072
Change-Id: I6fba6c49a01fa5f79cc33fe2e53aa998e350e03b
Reviewed-on: https://chromium-review.googlesource.com/1026392
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553825}
parent 14789b67
...@@ -129,11 +129,11 @@ static const int kMaxButtonWidth = 150; ...@@ -129,11 +129,11 @@ static const int kMaxButtonWidth = 150;
// Margins around the content. // Margins around the content.
static const int kDetachedTopMargin = 1; // When attached, we use 0 and let the static const int kDetachedTopMargin = 1; // When attached, we use 0 and let the
// toolbar above serve as the margin. // toolbar above serve as the margin.
static const int kBottomMargin = 2; static const int kBottomMargin = 4;
static const int kHorizontalMargin = 4; static const int kHorizontalMargin = 4;
// Padding between buttons. // Padding between buttons.
static const int kButtonPadding = 6; static const int kButtonPadding = 8;
// Width of the drop indicator. // Width of the drop indicator.
static const int kDropIndicatorWidth = 2; static const int kDropIndicatorWidth = 2;
...@@ -169,7 +169,7 @@ gfx::ImageSkia* GetImageSkiaNamed(int id) { ...@@ -169,7 +169,7 @@ gfx::ImageSkia* GetImageSkiaNamed(int id) {
} }
int GetInkDropCornerRadius() { int GetInkDropCornerRadius() {
return ui::MaterialDesignController::IsTouchOptimizedUiEnabled() ? 4 : 2; return ui::MaterialDesignController::IsNewerMaterialUi() ? 4 : 2;
} }
gfx::Insets GetInkDropInsets() { gfx::Insets GetInkDropInsets() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment