Commit 840ffc16 authored by Melissa Zhang's avatar Melissa Zhang Committed by Commit Bot

[Sharesheet] Limit extension for less than 8 targets.

This CL adds a condition that hides the "More Apps" section
when there are more than 1 but less than 8 targets.

Bug: 1130406
Change-Id: Id94069d3e6b3c13d313c52fe8516085da493e2ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2420172
Commit-Queue: Melissa Zhang <melzhang@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809225}
parent d4ce7fdc
......@@ -43,20 +43,22 @@ namespace {
// Sizes are in px.
constexpr int kButtonPadding = 8;
constexpr int kButtonWidth = 92;
constexpr int kBubbleTopPaddingFromWindow = 36;
constexpr int kCornerRadius = 12;
constexpr int kBubbleTopPaddingFromWindow = 36;
constexpr int kDefaultBubbleWidth = 416;
constexpr int kNoExtensionBubbleHeight = 340;
constexpr int kDefaultBubbleHeight = 380;
constexpr int kExpandedBubbleHeight = 522;
constexpr int kMaxTargetsPerRow = 4;
constexpr int kMaxRowsForDefaultView = 2;
// TargetViewHeight is 2*kButtonHeight + kButtonPadding
constexpr int kTargetViewHeight = 216;
constexpr int kTargetViewExpandedHeight = 382;
constexpr int kDefaultBubbleWidth = 416;
constexpr int kMaxRowsForDefaultView = 2;
constexpr int kExpandViewTitleLabelHeight = 22;
constexpr int kExpandViewPadding = 16;
constexpr int kDefaultBubbleHeight = 380;
constexpr int kExpandedBubbleHeight = 522;
constexpr int kShortSpacing = 20;
constexpr int kSpacing = 24;
constexpr int kTitleLineHeight = 24;
......@@ -154,7 +156,12 @@ void SharesheetBubbleView::ShowBubble(std::vector<TargetInfo> targets,
GetWidget()->GetRootView()->Layout();
widget->Show();
if (targets_.size() <= (kMaxRowsForDefaultView * kMaxTargetsPerRow)) {
width_ = kDefaultBubbleWidth;
height_ = kNoExtensionBubbleHeight;
} else {
SetToDefaultBubbleSizing();
}
UpdateAnchorPosition();
}
......@@ -165,9 +172,6 @@ std::unique_ptr<views::View> SharesheetBubbleView::MakeScrollableTargetView() {
default_view->SetLayoutManager(std::make_unique<views::GridLayout>());
SetUpTargetColumnSet(default_layout);
// TODO(crbug.com/1097623) When there are 8 or less apps don't show
// expanded_view.
auto expanded_view = std::make_unique<views::View>();
auto* expanded_layout =
expanded_view->SetLayoutManager(std::make_unique<views::GridLayout>());
......
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