From e1d44907402e651c13bc148e27757e72dd1f32b5 Mon Sep 17 00:00:00 2001 From: Matthew Mourgos Date: Mon, 13 Dec 2021 23:36:08 +0000 Subject: [PATCH] Update search box corner radius for tablet productivity launcher Bug: 1278576 Change-Id: I0da9fff585a7cb287329e7b26140eb3991071e24 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3329123 Reviewed-by: Toni Barzic Commit-Queue: Matthew Mourgos Cr-Commit-Position: refs/heads/main@{#951255} --- ash/app_list/views/search_box_view.cc | 4 +++- ash/search_box/search_box_constants.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ash/app_list/views/search_box_view.cc b/ash/app_list/views/search_box_view.cc index 4d2e6850e934e1..45509280f70c0d 100644 --- a/ash/app_list/views/search_box_view.cc +++ b/ash/app_list/views/search_box_view.cc @@ -442,7 +442,9 @@ int SearchBoxView::GetSearchBoxBorderCornerRadiusForState( AppListState state) const { if (state == AppListState::kStateSearchResults && app_list_view_ && !app_list_view_->is_in_drag()) { - return kSearchBoxBorderCornerRadiusSearchResult; + return features::IsProductivityLauncherEnabled() + ? kExpandedSearchBoxCornerRadiusForProductivityLauncher + : kSearchBoxBorderCornerRadiusSearchResult; } return kSearchBoxBorderCornerRadius; } diff --git a/ash/search_box/search_box_constants.h b/ash/search_box/search_box_constants.h index b74fce554fc081..7018e2e5e227ed 100644 --- a/ash/search_box/search_box_constants.h +++ b/ash/search_box/search_box_constants.h @@ -29,6 +29,10 @@ constexpr int kSearchBoxBorderCornerRadius = 24; // The background border corner radius of the expanded search box. constexpr int kSearchBoxBorderCornerRadiusSearchResult = 20; +// The background border corner radius of the active/expanded search box with +// productivity launcher enabled. +constexpr int kExpandedSearchBoxCornerRadiusForProductivityLauncher = 28; + // Preferred height of search box. constexpr int kSearchBoxPreferredHeight = 48;