Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / folder_header_view.cc

diff --git a/src/ui/app_list/views/folder_header_view.cc b/src/ui/app_list/views/folder_header_view.cc
index a06b7b1..4346fec 100644 (file)
--- a/src/ui/app_list/views/folder_header_view.cc
+++ b/src/ui/app_list/views/folder_header_view.cc
@@ -4,6 +4,8 @@
 
 #include "ui/app_list/views/folder_header_view.h"
 
+#include <algorithm>
+
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
@@ -25,10 +27,9 @@ const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
 const int kIconDimension = 24;
 const int kPadding = 14;
-const int kFolderNameWidth = 150;
-const int kFolderNameHeight = 30;
 const int kBottomSeparatorWidth = 380;
 const int kBottomSeparatorHeight = 1;
+const int kMaxFolderNameWidth = 300;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
@@ -47,11 +48,6 @@ class FolderHeaderView::FolderNameView : public views::Textfield {
   virtual ~FolderNameView() {
   }
 
-  // Overridden from views::View:
-  virtual gfx::Size GetPreferredSize() OVERRIDE {
-    return gfx::Size(kFolderNameWidth, kFolderNameHeight);
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FolderNameView);
 };
@@ -60,19 +56,26 @@ FolderHeaderView::FolderHeaderView(FolderHeaderViewDelegate* delegate)
     : folder_item_(NULL),
       back_button_(new views::ImageButton(this)),
       folder_name_view_(new FolderNameView),
-      delegate_(delegate) {
+      folder_name_placeholder_text_(
+          ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+              IDS_APP_LIST_FOLDER_NAME_PLACEHOLDER)),
+      delegate_(delegate),
+      folder_name_visible_(true) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   back_button_->SetImage(views::ImageButton::STATE_NORMAL,
       rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
   back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
       views::ImageButton::ALIGN_MIDDLE);
   AddChildView(back_button_);
+  back_button_->SetFocusable(true);
+  back_button_->SetAccessibleName(
+      ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+          IDS_APP_LIST_FOLDER_CLOSE_FOLDER_ACCESSIBILE_NAME));
 
   folder_name_view_->SetFontList(
       rb.GetFontList(ui::ResourceBundle::MediumFont));
   folder_name_view_->set_placeholder_text_color(kHintTextColor);
-  folder_name_view_->set_placeholder_text(
-      rb.GetLocalizedString(IDS_APP_LIST_FOLDER_NAME_PLACEHOLDER));
+  folder_name_view_->set_placeholder_text(folder_name_placeholder_text_);
   folder_name_view_->SetBorder(views::Border::NullBorder());
   folder_name_view_->SetBackgroundColor(kContentsBackgroundColor);
   folder_name_view_->set_controller(this);
@@ -93,14 +96,56 @@ void FolderHeaderView::SetFolderItem(AppListFolderItem* folder_item) {
     return;
   folder_item_->AddObserver(this);
 
+  folder_name_view_->SetEnabled(folder_item_->folder_type() !=
+                                AppListFolderItem::FOLDER_TYPE_OEM);
+
+  Update();
+}
+
+void FolderHeaderView::UpdateFolderNameVisibility(bool visible) {
+  folder_name_visible_ = visible;
   Update();
+  SchedulePaint();
+}
+
+void FolderHeaderView::OnFolderItemRemoved() {
+  folder_item_ = NULL;
 }
 
 void FolderHeaderView::Update() {
   if (!folder_item_)
     return;
 
-  folder_name_view_->SetText(base::UTF8ToUTF16(folder_item_->title()));
+  folder_name_view_->SetVisible(folder_name_visible_);
+  if (folder_name_visible_) {
+    folder_name_view_->SetText(base::UTF8ToUTF16(folder_item_->name()));
+    UpdateFolderNameAccessibleName();
+  }
+
+  Layout();
+}
+
+void FolderHeaderView::UpdateFolderNameAccessibleName() {
+  // Sets |folder_name_view_|'s accessible name to the placeholder text if
+  // |folder_name_view_| is blank; otherwise, clear the accessible name, the
+  // accessible state's value is set to be folder_name_view_->text() by
+  // TextField.
+  base::string16 accessible_name = folder_name_view_->text().empty()
+                                       ? folder_name_placeholder_text_
+                                       : base::string16();
+  folder_name_view_->SetAccessibleName(accessible_name);
+}
+
+const base::string16& FolderHeaderView::GetFolderNameForTest() {
+  return folder_name_view_->text();
+}
+
+void FolderHeaderView::SetFolderNameForTest(const base::string16& name) {
+  folder_name_view_->SetText(name);
+}
+
+bool FolderHeaderView::IsFolderNameEnabledForTest() const {
+  return folder_name_view_->enabled();
 }
 
 gfx::Size FolderHeaderView::GetPreferredSize() {
@@ -117,7 +162,13 @@ void FolderHeaderView::Layout() {
   back_button_->SetBoundsRect(back_bounds);
 
   gfx::Rect text_bounds(rect);
-  int text_width = folder_name_view_->GetPreferredSize().width();
+  base::string16 text = folder_item_->name().empty()
+                            ? folder_name_placeholder_text_
+                            : base::UTF8ToUTF16(folder_item_->name());
+  int text_width =
+      gfx::Canvas::GetStringWidth(text, folder_name_view_->GetFontList()) +
+      folder_name_view_->GetCaretBounds().width();
+  text_width = std::min(text_width, kMaxFolderNameWidth);
   text_bounds.set_x(back_bounds.x() + (rect.width() - text_width) / 2);
   text_bounds.set_width(text_width);
   text_bounds.ClampToCenteredSize(gfx::Size(text_bounds.width(),
@@ -125,11 +176,18 @@ void FolderHeaderView::Layout() {
   folder_name_view_->SetBoundsRect(text_bounds);
 }
 
+bool FolderHeaderView::OnKeyPressed(const ui::KeyEvent& event) {
+  if (event.key_code() == ui::VKEY_RETURN)
+    delegate_->GiveBackFocusToSearchBox();
+
+  return false;
+}
+
 void FolderHeaderView::OnPaint(gfx::Canvas* canvas) {
   views::View::OnPaint(canvas);
 
   gfx::Rect rect(GetContentsBounds());
-  if (rect.IsEmpty())
+  if (rect.IsEmpty() || !folder_name_visible_)
     return;
 
   // Draw bottom separator line.
@@ -147,9 +205,16 @@ void FolderHeaderView::ContentsChanged(views::Textfield* sender,
     return;
 
   folder_item_->RemoveObserver(this);
-  std::string name = base::UTF16ToUTF8(folder_name_view_->text());
-  folder_item_->SetTitleAndFullName(name, name);
+  // Enforce the maximum folder name length in UI.
+  std::string name = base::UTF16ToUTF8(
+      folder_name_view_->text().substr(0, kMaxFolderNameChars));
+  if (name != folder_item_->name())
+    delegate_->SetItemName(folder_item_, name);
   folder_item_->AddObserver(this);
+
+  UpdateFolderNameAccessibleName();
+
+  Layout();
 }
 
 void FolderHeaderView::ButtonPressed(views::Button* sender,
@@ -160,7 +225,7 @@ void FolderHeaderView::ButtonPressed(views::Button* sender,
 void FolderHeaderView::ItemIconChanged() {
 }
 
-void FolderHeaderView::ItemTitleChanged() {
+void FolderHeaderView::ItemNameChanged() {
   Update();
 }
 
@@ -174,4 +239,3 @@ void FolderHeaderView::ItemPercentDownloadedChanged() {
 }
 
 }  // namespace app_list
-