[Contextual Search] Add a handle to the bar when Chrome Home is enabled

chrome/browser/android/compositor/layer/contextual_search_layer.cc

 // Copyright 2014 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 "chrome/browser/android/compositor/layer/contextual_search_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
@@ skipping 79 matching lines @@
     float progress_bar_height,
     float progress_bar_opacity,
     int progress_bar_completion,
     float divider_line_visibility_percentage,
     float divider_line_width,
     float divider_line_height,
     int divider_line_color,
     float divider_line_x_offset,
     bool touch_highlight_visible,
     float touch_highlight_x_offset,
-    float touch_highlight_width) {
+    float touch_highlight_width,
+    int bar_handle_resource_id,
+    float bar_handle_offset_y,
+    float bar_padding_bottom) {
   // Round values to avoid pixel gap between layers.
   search_bar_height = floor(search_bar_height);
 
   float search_bar_top = search_peek_promo_height;
   float search_bar_bottom = search_bar_top + search_bar_height;
   bool should_render_progress_bar =
       progress_bar_visible && progress_bar_opacity > 0.f;
 
   OverlayPanelLayer::SetResourceIds(
       search_term_resource_id, panel_shadow_resource_id,
       search_bar_shadow_resource_id, search_provider_icon_resource_id,
-      close_icon_resource_id);
+      close_icon_resource_id, bar_handle_resource_id);
 
   float content_view_top = search_bar_bottom + search_promo_height;
   float should_render_bar_border = search_bar_border_visible
       && !should_render_progress_bar;
 
   // -----------------------------------------------------------------
   // Overlay Panel
   // -----------------------------------------------------------------
   OverlayPanelLayer::SetProperties(
-      dp_to_px,
-      content_layer,
-      content_view_top,
-      search_panel_x,
-      search_panel_y,
-      search_panel_width,
-      search_panel_height,
-      search_bar_margin_side,
-      search_bar_height,
-      search_bar_top,
-      search_term_opacity,
-      should_render_bar_border,
-      search_bar_border_height,
-      search_bar_shadow_visible,
-      search_bar_shadow_opacity,
-      close_icon_opacity);
+      dp_to_px, content_layer, content_view_top, search_panel_x, search_panel_y,
+      search_panel_width, search_panel_height, search_bar_margin_side,
+      search_bar_height, search_bar_top, search_term_opacity,
+      should_render_bar_border, search_bar_border_height,
+      search_bar_shadow_visible, search_bar_shadow_opacity, close_icon_opacity,
+      bar_handle_offset_y, bar_padding_bottom);
 
   bool is_rtl = l10n_util::IsLayoutRtl();
 
   // ---------------------------------------------------------------------------
   // Peek Promo
   // ---------------------------------------------------------------------------
   if (search_peek_promo_visible) {
     // Grabs the Search Opt Out Promo resource.
     ui::Resource* peek_promo_text_resource = resource_manager_->GetResource(
         ui::ANDROID_RESOURCE_TYPE_DYNAMIC, peek_promo_text_resource_id);
@@ skipping 78 matching lines @@
     }
   } else {
     // Peek Promo Container
     if (peek_promo_container_.get() && peek_promo_container_->parent())
       peek_promo_container_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Search Term, Context and Search Caption
   // ---------------------------------------------------------------------------
-  SetupTextLayer(
-      search_bar_top,
-      search_bar_height,
-      search_text_layer_min_height,
-      search_caption_resource_id,
-      search_caption_visible,
-      search_caption_animation_percentage,
-      search_term_opacity,
-      search_context_resource_id,
-      search_context_opacity,
-      search_term_caption_spacing);
+  SetupTextLayer(bar_content_height_, search_text_layer_min_height,
+                 search_caption_resource_id, search_caption_visible,
+                 search_caption_animation_percentage, search_term_opacity,
+                 search_context_resource_id, search_context_opacity,
+                 search_term_caption_spacing);
 
   // ---------------------------------------------------------------------------
   // Arrow Icon
   // ---------------------------------------------------------------------------
   // Grabs the arrow icon resource.
   ui::Resource* arrow_icon_resource = resource_manager_->GetResource(
       ui::ANDROID_RESOURCE_TYPE_STATIC, arrow_up_resource_id);
 
   // Positions the icon at the end of the bar.
   float arrow_icon_left;
   if (is_rtl) {
     arrow_icon_left = search_bar_margin_side;
   } else {
     arrow_icon_left = search_panel_width - arrow_icon_resource->size().width() -
                       search_bar_margin_side;
   }
 
   // Centers the Arrow Icon vertically in the bar.
-  float arrow_icon_top = search_bar_top + search_bar_height / 2 -
-                         arrow_icon_resource->size().height() / 2;
+  float arrow_icon_top =
+      (bar_content_height_ - arrow_icon_resource->size().height()) / 2;
 
   arrow_icon_->SetUIResourceId(arrow_icon_resource->ui_resource()->id());
   arrow_icon_->SetBounds(arrow_icon_resource->size());
   arrow_icon_->SetPosition(
       gfx::PointF(arrow_icon_left, arrow_icon_top));
   arrow_icon_->SetOpacity(arrow_icon_opacity);
 
   gfx::Transform transform;
   if (arrow_icon_rotation != 0.f) {
     // Apply rotation about the center of the icon.
@@ skipping 100 matching lines @@
 
     if (progress_bar_.get() && progress_bar_->parent())
       progress_bar_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Divider Line
   // ---------------------------------------------------------------------------
   if (divider_line_visibility_percentage > 0.f) {
     if (divider_line_->parent() != layer_)
-      layer_->AddChild(divider_line_);
+      bar_content_layer_->AddChild(divider_line_);
 
     // The divider line animates in from the bottom.
     float divider_line_y_offset =
-        ((search_bar_height - divider_line_height) / 2) +
+        ((bar_content_height_ - divider_line_height) / 2) +
         (divider_line_height * (1.f - divider_line_visibility_percentage));
     divider_line_->SetPosition(gfx::PointF(divider_line_x_offset,
                                            divider_line_y_offset));
 
     // The divider line should not draw below its final resting place.
     // Set bounds to restrict the vertical draw position.
     divider_line_->SetBounds(
         gfx::Size(divider_line_width,
                   divider_line_height * divider_line_visibility_percentage));
     divider_line_->SetBackgroundColor(divider_line_color);
@@ skipping 110 matching lines @@
   // If the custom image has a height less than |bar_image_size_|, it will
   // have a top margin that needs to be accounted for while running the
   // animation. The final |custom_image_y_offset| should be equal to
   // |tpp_margin|.
   float custom_image_y_offset =
       (bar_image_size_ * (1.f - visibility_percentage)) + top_margin;
   custom_image_layer->SetPosition(
       gfx::PointF(side_margin, custom_image_y_offset));
 }
 
-void ContextualSearchLayer::SetupTextLayer(float bar_top,
-                                           float bar_height,
+void ContextualSearchLayer::SetupTextLayer(float bar_height,
                                            float search_text_layer_min_height,
                                            int caption_resource_id,
                                            bool caption_visible,
                                            float animation_percentage,
                                            float search_term_opacity,
                                            int context_resource_id,
                                            float context_opacity,
                                            float term_caption_spacing) {
   // ---------------------------------------------------------------------------
   // Setup the Drawing Hierarchy
@@ skipping 50 matching lines @@
   // The search_caption_ may not have had it's resource set by this point, if so
   // the bounds will be zero and everything will still work.
   float term_height = main_text->bounds().height();
   float caption_height = search_caption_->bounds().height();
 
   float layer_height = std::max(search_text_layer_min_height,
       term_height + caption_height + term_caption_spacing);
   float layer_width =
       std::max(main_text->bounds().width(), search_caption_->bounds().width());
 
-  float layer_top = bar_top + (bar_height - layer_height) / 2;
+  float layer_top = (bar_height - layer_height) / 2;
   text_layer_->SetBounds(gfx::Size(layer_width, layer_height));
   text_layer_->SetPosition(gfx::PointF(0.f, layer_top));
   text_layer_->SetMasksToBounds(true);
 
   // ---------------------------------------------------------------------------
   // Layout Text Layer
   // ---------------------------------------------------------------------------
   // ---Top of Search Bar--- <- bar_top
   //
   // ---Top of Text Layer--- <- layer_top
@@ skipping 155 matching lines @@
   peek_promo_container_->AddChild(peek_promo_text_);
 
   // Search Bar Text
   search_context_->SetIsDrawable(true);
 
   // Search Bar Caption
   search_caption_->SetIsDrawable(true);
 
   // Arrow Icon
   arrow_icon_->SetIsDrawable(true);
-  layer_->AddChild(arrow_icon_);
+  bar_content_layer_->AddChild(arrow_icon_);
 
   // Search Opt Out Promo
   search_promo_container_->SetIsDrawable(true);
   search_promo_container_->SetBackgroundColor(kSearchBackgroundColor);
   search_promo_->SetIsDrawable(true);
 
   // Progress Bar Background
   progress_bar_background_->SetIsDrawable(true);
   progress_bar_background_->SetFillCenter(true);
 
   // Progress Bar
   progress_bar_->SetIsDrawable(true);
   progress_bar_->SetFillCenter(true);
 
   // Icon - holds thumbnail, search provider icon and/or quick action icon
   icon_layer_->SetIsDrawable(true);
-  layer_->AddChild(icon_layer_);
+  bar_content_layer_->AddChild(icon_layer_);
 
   // Search provider icon
   search_provider_icon_layer_->SetIsDrawable(true);
 
   // Thumbnail
   thumbnail_layer_->SetIsDrawable(true);
 
   // Quick action icon
   quick_action_icon_layer_->SetIsDrawable(true);
 
   // Divider line
   divider_line_->SetIsDrawable(true);
 
   // Content layer
   text_layer_->SetIsDrawable(true);
   // NOTE(mdjones): This can be called multiple times to add other text layers.
   AddBarTextLayer(text_layer_);
   text_layer_->AddChild(search_context_);
 
   // Touch Highlight Layer
   touch_highlight_layer_->SetIsDrawable(true);
   touch_highlight_layer_->SetBackgroundColor(kTouchHighlightColor);
 }
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 }  //  namespace android