Update the layout of opt-in IME menu.

ash/common/system/chromeos/ime_menu/ime_menu_tray.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 29 matching lines @@
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 
 using chromeos::input_method::InputMethodManager;
 
 namespace ash {
 
 namespace {
+// The width of the IME menu in dp.
+const int kImeMenuWidth = 332;

[tdanderson, 2016/11/30 23:16:01]

The system menu size has since been increased to 352. We already have these
constants in system_tray.cc:

// The minimum width of the system tray menu.
const int kMinimumSystemTrayMenuWidth = 300;
const int kMinimumSystemTrayMenuWidthMd = 352;

Please move these into tray_constants.cc so they can be shared by both the
system menu and the opt-in ime menu rather than introduce a duplicate constant
in this file.

[Azure Wei, 2016/12/01 02:55:34]

Done. Move kMinimumSystemTrayMenuWidth(Md) into tray_constants.cc as
kTrayMenuMinimumWidth(Md) and use them in system_tray.cc and ime_menu_tray.cc.

+
+// The bottom padding of the title label.
+const int kTitleRowBottomPadding = 5;
+
 // Returns the height range of ImeListView.
 gfx::Range GetImeListViewRange() {
   const int max_items = 5;
   const int min_items = 2;
   const int tray_item_height = GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT);
   return gfx::Range(tray_item_height * min_items, tray_item_height * max_items);
 }
 
 // Shows language and input settings page.
 void ShowIMESettings() {
@@ skipping 47 matching lines @@
         views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0,
                                       kHorizontalSeparatorColor),
         gfx::Insets(kMenuSeparatorVerticalPadding - kSeparatorWidth, 0)));
     auto* box_layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
     box_layout->set_minimum_cross_axis_size(
         GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
     SetLayoutManager(box_layout);
     title_label_ =
         new views::Label(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_IME));
-    title_label_->SetBorder(
-        views::CreateEmptyBorder(0, kMenuEdgeEffectivePadding, 0, 0));
+    title_label_->SetBorder(views::CreateEmptyBorder(

[tdanderson, 2016/11/30 23:16:01]

For reference can you post a screenshot to the bug of what this looks like
(ideally at 2x scale factor which you can get with --force-device-scale-factor=2
on the command line)? Also, if you haven't done so already, please compare the
height of the title row with Sebastien's mocks in the bug.

[Azure Wei, 2016/12/01 02:55:34]

Compared that the title row height should match. I'll post the screenshot to the
bug.

+        0, kMenuEdgeEffectivePadding, kTitleRowBottomPadding, 0));
     title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(title_label_);
     box_layout->SetFlexForView(title_label_, 1);
 
     if (show_settings_button) {
       settings_button_ = CreateImeMenuButton(
           this, kSystemMenuSettingsIcon, IDS_ASH_STATUS_TRAY_IME_SETTINGS, 0);
       if (IsInLoginOrLockScreen())
         settings_button_->SetEnabled(false);
       AddChildView(settings_button_);
@@ skipping 189 matching lines @@
 ImeMenuTray::~ImeMenuTray() {
   if (bubble_)
     bubble_->bubble_view()->reset_delegate();
   SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
   tray_notifier->RemoveIMEObserver(this);
   tray_notifier->RemoveVirtualKeyboardObserver(this);
 }
 
 void ImeMenuTray::ShowImeMenuBubble() {
   should_block_shelf_auto_hide_ = true;
-  views::TrayBubbleView::InitParams init_params(
-      GetAnchorAlignment(), kTrayPopupMinWidth, kTrayPopupMaxWidth);
+  views::TrayBubbleView::InitParams init_params(GetAnchorAlignment(),
+                                                kImeMenuWidth, kImeMenuWidth);
   init_params.can_activate = true;
   init_params.close_on_deactivate = true;
 
   views::TrayBubbleView* bubble_view =
       views::TrayBubbleView::Create(GetBubbleAnchor(), this, &init_params);
   bubble_view->set_anchor_view_insets(GetBubbleAnchorInsets());
 
   // In the material design, we will add a title item with a separator on the
   // top of the IME menu.
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
@@ skipping 10 matching lines @@
                                    ImeListView::SHOW_SINGLE_IME);
 
   uint32_t current_height = ime_list_view_->scroll_content()->height();
   const gfx::Range height_range = GetImeListViewRange();
 
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
     ime_list_view_->scroller()->ClipHeightTo(height_range.start(),
                                              height_range.end());
   } else if (current_height > height_range.end()) {
     ime_list_view_->scroller()->SetFixedSize(
-        gfx::Size(kTrayPopupMaxWidth, height_range.end()));
+        gfx::Size(kImeMenuWidth, height_range.end()));
   } else if (current_height < height_range.start()) {
     ime_list_view_->scroller()->SetFixedSize(
-        gfx::Size(kTrayPopupMaxWidth, height_range.start()));
+        gfx::Size(kImeMenuWidth, height_range.start()));
   }
   bubble_view->AddChildView(ime_list_view_);
 
   // The bottom view that contains buttons are not supported in login/lock
   // screen.
   if (!IsInLoginOrLockScreen()) {
     if (ShouldShowEmojiHandwritingVoiceButtons()) {
       bubble_view->AddChildView(
           new ImeButtonsView(this, true, true, true, true));
     } else if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
@@ skipping 187 matching lines @@
   WmShell::Get()->system_tray_delegate()->GetCurrentIME(&current_ime_);
 
   // Updates the tray label based on the current input method.
   if (current_ime_.third_party)
     label_->SetText(current_ime_.short_name + base::UTF8ToUTF16("*"));
   else
     label_->SetText(current_ime_.short_name);
 }
 
 }  // namespace ash