Remove defunct arrow from Contextual Search old layout

Remove the code for the arrow icon no longer used in the new layout.

Bug: 1143472
Change-Id: Ic003e16bb392d21ba7136383b20511f705fd606f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560931Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Eric Lawrence [MSFT] <ericlaw@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#832401}

chrome/android/chrome_java_resources.gni

@@ -31,7 +31,6 @@ chrome_java_resources = [
   "java/res/drawable-hdpi/bookmark_check_gray.png",
   "java/res/drawable-hdpi/bookmark_edit_active.png",
   "java/res/drawable-hdpi/bookmark_move_active.png",
-  "java/res/drawable-hdpi/breadcrumb_arrow.png",
   "java/res/drawable-hdpi/btn_bg_holo_active_normal.png",
   "java/res/drawable-hdpi/btn_bg_holo_active_pressed.png",
   "java/res/drawable-hdpi/btn_bg_holo_pressed.png",
@@ -170,7 +169,6 @@ chrome_java_resources = [
   "java/res/drawable-mdpi/bookmark_check_gray.png",
   "java/res/drawable-mdpi/bookmark_edit_active.png",
   "java/res/drawable-mdpi/bookmark_move_active.png",
-  "java/res/drawable-mdpi/breadcrumb_arrow.png",
   "java/res/drawable-mdpi/btn_bg_holo_active_normal.png",
   "java/res/drawable-mdpi/btn_bg_holo_active_pressed.png",
   "java/res/drawable-mdpi/btn_bg_holo_pressed.png",
@@ -298,7 +296,6 @@ chrome_java_resources = [
   "java/res/drawable-xhdpi/bookmark_check_gray.png",
   "java/res/drawable-xhdpi/bookmark_edit_active.png",
   "java/res/drawable-xhdpi/bookmark_move_active.png",
-  "java/res/drawable-xhdpi/breadcrumb_arrow.png",
   "java/res/drawable-xhdpi/btn_bg_holo_active_normal.png",
   "java/res/drawable-xhdpi/btn_bg_holo_active_pressed.png",
   "java/res/drawable-xhdpi/btn_bg_holo_pressed.png",
@@ -407,7 +404,6 @@ chrome_java_resources = [
   "java/res/drawable-xxhdpi/bookmark_check_gray.png",
   "java/res/drawable-xxhdpi/bookmark_edit_active.png",
   "java/res/drawable-xxhdpi/bookmark_move_active.png",
-  "java/res/drawable-xxhdpi/breadcrumb_arrow.png",
   "java/res/drawable-xxhdpi/btn_close_white.png",
   "java/res/drawable-xxhdpi/btn_left.png",
   "java/res/drawable-xxhdpi/btn_mic.png",
@@ -512,7 +508,6 @@ chrome_java_resources = [
   "java/res/drawable-xxxhdpi/bookmark_check_gray.png",
   "java/res/drawable-xxxhdpi/bookmark_edit_active.png",
   "java/res/drawable-xxxhdpi/bookmark_move_active.png",
-  "java/res/drawable-xxxhdpi/breadcrumb_arrow.png",
   "java/res/drawable-xxxhdpi/btn_close_white.png",
   "java/res/drawable-xxxhdpi/btn_left.png",
   "java/res/drawable-xxxhdpi/btn_mic.png",

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelBase.java

@@ -59,16 +59,10 @@ abstract class OverlayPanelBase {
     private static final float BASE_PAGE_BRIGHTNESS_STATE_MAXIMIZED = .4f;
 
     // -------------------------------------------------------------------------
-    // TODO(donnd): crbug.com/1143472 - The arrow and close buttons from the
-    // legacy UI are no longer used. Remove code related to these buttons here
-    // and in the native interface.
+    // TODO(donnd): crbug.com/1143472 - The close button from the legacy UI is
+    // no longer used. Remove code related to the button here and in the native
+    // interface.
     //
-    /** The opacity of the arrow icon. */
-    private static final float ARROW_ICON_OPACITY_TRANSPARENT = 0.f;
-
-    /** The rotation of the arrow icon. */
-    private static final float ARROW_ICON_ROTATION = -90.f;
-
     /** The opacity of the Open-Tab icon when the Panel is peeking. */
     private static final float OPEN_TAB_ICON_OPACITY_STATE_PEEKED = 1.f;
 
@@ -480,20 +474,6 @@ abstract class OverlayPanelBase {
                 mContext.getResources(), R.color.overlay_panel_separator_line_color);
     }
 
-    /**
-     * @return The opacity of the arrow icon.
-     */
-    public float getArrowIconOpacity() {
-        return ARROW_ICON_OPACITY_TRANSPARENT;
-    }
-
-    /**
-     * @return The rotation of the arrow icon, in degrees.
-     */
-    public float getArrowIconRotation() {
-        return ARROW_ICON_ROTATION;
-    }
-
     /**
      * @return The opacity of the close icon.
      */

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java

@@ -113,8 +113,6 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
 
         final int iconColor = panel.getIconColor();
         final int dragHandlebarColor = panel.getDragHandlebarColor();
-        float arrowIconOpacity = panel.getArrowIconOpacity();
-        float arrowIconRotation = panel.getArrowIconRotation();
 
         float closeIconOpacity = panel.getCloseIconOpacity();
 
@@ -144,24 +142,24 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
         int panelShadowResourceId = R.drawable.overlay_side_shadow;
         int closeIconResourceId = INVALID_RESOURCE_ID;
 
-        // TODO(donnd): crbug.com/1143472 - Remove four parameters for the now
-        // defunct arrow |R.drawable.breadcrumb_arrow| and close buttons from
-        // the interface and the associated code on the native side.
+        // TODO(donnd): crbug.com/1143472 - Remove parameters for the now
+        // defunct close button from the interface and the associated code on
+        // the native side.
         ContextualSearchSceneLayerJni.get().updateContextualSearchLayer(mNativePtr,
                 ContextualSearchSceneLayer.this, panelShadowResourceId, searchBarBackgroundColor,
                 searchContextViewId, searchTermViewId, searchCaptionViewId,
                 R.drawable.modern_toolbar_shadow, R.drawable.ic_logo_googleg_24dp,
-                quickActionIconResId, R.drawable.breadcrumb_arrow, dragHandlebarId,
-                openNewTabIconId, closeIconResourceId, R.drawable.progress_bar_background,
-                R.drawable.progress_bar_foreground, searchPromoViewId,
-                R.drawable.contextual_search_promo_ripple, searchBarBannerTextViewId, mDpToPx,
-                panel.getFullscreenWidth() * mDpToPx, panel.getTabHeight() * mDpToPx,
-                panel.getBasePageBrightness(), panel.getBasePageY() * mDpToPx, panelWebContents,
-                searchPromoVisible, searchPromoHeightPx, searchPromoOpacity,
-                searchPromoBackgroundColor, searchBarBannerVisible, searchBarBannerHeightPx,
-                searchBarBannerPaddingPx, searchBarBannerRippleWidthPx,
-                searchBarBannerRippleOpacity, searchBarBannerTextOpacity, searchPanelX * mDpToPx,
-                searchPanelY * mDpToPx, searchPanelWidth * mDpToPx, searchPanelHeight * mDpToPx,
+                quickActionIconResId, dragHandlebarId, openNewTabIconId, closeIconResourceId,
+                R.drawable.progress_bar_background, R.drawable.progress_bar_foreground,
+                searchPromoViewId, R.drawable.contextual_search_promo_ripple,
+                searchBarBannerTextViewId, mDpToPx, panel.getFullscreenWidth() * mDpToPx,
+                panel.getTabHeight() * mDpToPx, panel.getBasePageBrightness(),
+                panel.getBasePageY() * mDpToPx, panelWebContents, searchPromoVisible,
+                searchPromoHeightPx, searchPromoOpacity, searchPromoBackgroundColor,
+                searchBarBannerVisible, searchBarBannerHeightPx, searchBarBannerPaddingPx,
+                searchBarBannerRippleWidthPx, searchBarBannerRippleOpacity,
+                searchBarBannerTextOpacity, searchPanelX * mDpToPx, searchPanelY * mDpToPx,
+                searchPanelWidth * mDpToPx, searchPanelHeight * mDpToPx,
                 searchBarMarginSide * mDpToPx, searchBarMarginTop * mDpToPx,
                 searchBarHeight * mDpToPx, searchContextOpacity,
                 searchBarControl.getTextLayerMinHeight(), searchTermOpacity,
@@ -169,12 +167,11 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
                 searchCaptionVisible, searchBarBorderVisible, searchBarBorderHeight * mDpToPx,
                 quickActionIconVisible, thumbnailVisible, thumbnailUrl,
                 customImageVisibilityPercentage, barImageSize, iconColor, dragHandlebarColor,
-                arrowIconOpacity, arrowIconRotation, closeIconOpacity, isProgressBarVisible,
-                progressBarHeight * mDpToPx, progressBarOpacity, progressBarCompletion,
-                dividerLineVisibilityPercentage, dividerLineWidth, dividerLineHeight,
-                dividerLineColor, dividerLineXOffset, touchHighlightVisible, touchHighlightXOffset,
-                touchHighlightWidth, Profile.getLastUsedRegularProfile(), roundedBarTopResourceId,
-                separatorLineColor);
+                closeIconOpacity, isProgressBarVisible, progressBarHeight * mDpToPx,
+                progressBarOpacity, progressBarCompletion, dividerLineVisibilityPercentage,
+                dividerLineWidth, dividerLineHeight, dividerLineColor, dividerLineXOffset,
+                touchHighlightVisible, touchHighlightXOffset, touchHighlightWidth,
+                Profile.getLastUsedRegularProfile(), roundedBarTopResourceId, separatorLineColor);
     }
 
     @CalledByNative
@@ -227,9 +224,9 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
                 int searchBarBackgroundColor, int searchContextResourceId, int searchTermResourceId,
                 int searchCaptionResourceId, int searchBarShadowResourceId,
                 int searchProviderIconResourceId, int quickActionIconResourceId,
-                int arrowUpResourceId, int dragHandlebarResourceId, int openTabIconResourceId,
-                int closeIconResourceId, int progressBarBackgroundResourceId,
-                int progressBarResourceId, int searchPromoResourceId, int barBannerRippleResourceId,
+                int dragHandlebarResourceId, int openTabIconResourceId, int closeIconResourceId,
+                int progressBarBackgroundResourceId, int progressBarResourceId,
+                int searchPromoResourceId, int barBannerRippleResourceId,
                 int barBannerTextResourceId, float dpToPx, float layoutWidth, float layoutHeight,
                 float basePageBrightness, float basePageYOffset, WebContents webContents,
                 boolean searchPromoVisible, float searchPromoHeight, float searchPromoOpacity,
@@ -245,9 +242,8 @@ public class ContextualSearchSceneLayer extends SceneOverlayLayer {
                 float searchBarBorderHeight, boolean quickActionIconVisible,
                 boolean thumbnailVisible, String thumbnailUrl,
                 float customImageVisibilityPercentage, int barImageSize, int iconColor,
-                int dragHandlebarColor, float arrowIconOpacity, float arrowIconRotation,
-                float closeIconOpacity, boolean isProgressBarVisible, float progressBarHeight,
-                float progressBarOpacity, float progressBarCompletion,
+                int dragHandlebarColor, float closeIconOpacity, boolean isProgressBarVisible,
+                float progressBarHeight, float progressBarOpacity, float progressBarCompletion,
                 float dividerLineVisibilityPercentage, float dividerLineWidth,
                 float dividerLineHeight, int dividerLineColor, float dividerLineXOffset,
                 boolean touchHighlightVisible, float touchHighlightXOffset,

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

@@ -41,7 +41,6 @@ void ContextualSearchLayer::SetProperties(
     int search_bar_shadow_resource_id,
     int search_provider_icon_resource_id,
     int quick_action_icon_resource_id,
-    int arrow_up_resource_id,
     int drag_handlebar_resource_id,
     int open_tab_icon_resource_id,
     int close_icon_resource_id,
@@ -83,8 +82,6 @@ void ContextualSearchLayer::SetProperties(
     int bar_image_size,
     int icon_color,
     int drag_handlebar_color,
-    float arrow_icon_opacity,
-    float arrow_icon_rotation,
     float close_icon_opacity,
     bool progress_bar_visible,
     float progress_bar_height,
@@ -234,45 +231,6 @@ void ContextualSearchLayer::SetProperties(
                      search_context_resource_id, search_context_opacity,
                      search_term_caption_spacing);
 
-  // ---------------------------------------------------------------------------
-  // Arrow Icon.  Deprecated -- old layout only.
-  // ---------------------------------------------------------------------------
-  // Grabs the arrow icon resource.
-  ui::Resource* arrow_icon_resource =
-      resource_manager_->GetStaticResourceWithTint(arrow_up_resource_id,
-                                                   icon_color);
-
-  // 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;
-
-  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.
-    float pivot_x = floor(arrow_icon_resource->size().width() / 2);
-    float pivot_y = floor(arrow_icon_resource->size().height() / 2);
-    gfx::PointF pivot_origin(pivot_x, pivot_y);
-    transform.Translate(pivot_origin.x(), pivot_origin.y());
-    transform.RotateAboutZAxis(arrow_icon_rotation);
-    transform.Translate(-pivot_origin.x(), -pivot_origin.y());
-  }
-  arrow_icon_->SetTransform(transform);
-
   // ---------------------------------------------------------------------------
   // Search Promo
   // ---------------------------------------------------------------------------
@@ -690,7 +648,6 @@ ContextualSearchLayer::ContextualSearchLayer(
       search_provider_icon_layer_(cc::UIResourceLayer::Create()),
       thumbnail_layer_(cc::UIResourceLayer::Create()),
       quick_action_icon_layer_(cc::UIResourceLayer::Create()),
-      arrow_icon_(cc::UIResourceLayer::Create()),
       search_promo_(cc::UIResourceLayer::Create()),
       search_promo_container_(cc::SolidColorLayer::Create()),
       bar_banner_container_(cc::SolidColorLayer::Create()),
@@ -715,10 +672,6 @@ ContextualSearchLayer::ContextualSearchLayer(
   // Search Bar Caption
   search_caption_->SetIsDrawable(true);
 
-  // Arrow Icon
-  arrow_icon_->SetIsDrawable(true);
-  layer_->AddChild(arrow_icon_);
-
   // Search Opt Out Promo
   search_promo_container_->SetIsDrawable(true);
   search_promo_container_->SetBackgroundColor(kSearchBackgroundColor);

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

@@ -43,7 +43,6 @@ class ContextualSearchLayer : public OverlayPanelLayer {
                      int search_bar_shadow_resource_id,
                      int search_provider_icon_resource_id,
                      int quick_action_icon_resource_id,
-                     int arrow_up_resource_id,
                      int drag_handlebar_resource_id,
                      int open_tab_icon_resource_id,
                      int close_icon_resource_id,
@@ -85,8 +84,6 @@ class ContextualSearchLayer : public OverlayPanelLayer {
                      int bar_image_size,
                      int icon_color,
                      int drag_handlebar_color,
-                     float arrow_icon_opacity,
-                     float arrow_icon_rotation,
                      float close_icon_opacity,
                      bool progress_bar_visible,
                      float progress_bar_height,
@@ -147,7 +144,6 @@ class ContextualSearchLayer : public OverlayPanelLayer {
   scoped_refptr<cc::UIResourceLayer> search_provider_icon_layer_;
   scoped_refptr<cc::UIResourceLayer> thumbnail_layer_;
   scoped_refptr<cc::UIResourceLayer> quick_action_icon_layer_;
-  scoped_refptr<cc::UIResourceLayer> arrow_icon_;
   scoped_refptr<cc::UIResourceLayer> search_promo_;
   scoped_refptr<cc::SolidColorLayer> search_promo_container_;
   scoped_refptr<cc::SolidColorLayer> bar_banner_container_;

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

@@ -76,7 +76,6 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jint search_bar_shadow_resource_id,
     jint search_provider_icon_resource_id,
     jint quick_action_icon_resource_id,
-    jint arrow_up_resource_id,
     jint drag_handlebar_resource_id,
     jint open_tab_icon_resource_id,
     jint close_icon_resource_id,
@@ -123,8 +122,6 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     jint bar_image_size,
     jint icon_color,
     jint drag_handlebar_color,
-    jfloat arrow_icon_opacity,
-    jfloat arrow_icon_rotation,
     jfloat close_icon_opacity,
     jboolean progress_bar_visible,
     jfloat progress_bar_height,
@@ -171,26 +168,24 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
       search_context_resource_id, search_term_resource_id,
       search_caption_resource_id, search_bar_shadow_resource_id,
       search_provider_icon_resource_id, quick_action_icon_resource_id,
-      arrow_up_resource_id, drag_handlebar_resource_id,
-      open_tab_icon_resource_id, close_icon_resource_id,
-      progress_bar_background_resource_id, progress_bar_resource_id,
-      search_promo_resource_id, bar_banner_ripple_resource_id,
-      bar_banner_text_resource_id, dp_to_px, content_layer,
-      search_promo_visible, search_promo_height, search_promo_opacity,
-      search_promo_background_color, search_bar_banner_visible,
-      search_bar_banner_height, search_bar_banner_padding,
-      search_bar_banner_ripple_width, search_bar_banner_ripple_opacity,
-      search_bar_banner_text_opacity, search_panel_x, search_panel_y,
-      search_panel_width, search_panel_height, search_bar_margin_side,
-      search_bar_margin_top, search_bar_height, search_context_opacity,
-      search_text_layer_min_height, search_term_opacity,
+      drag_handlebar_resource_id, open_tab_icon_resource_id,
+      close_icon_resource_id, progress_bar_background_resource_id,
+      progress_bar_resource_id, search_promo_resource_id,
+      bar_banner_ripple_resource_id, bar_banner_text_resource_id, dp_to_px,
+      content_layer, search_promo_visible, search_promo_height,
+      search_promo_opacity, search_promo_background_color,
+      search_bar_banner_visible, search_bar_banner_height,
+      search_bar_banner_padding, search_bar_banner_ripple_width,
+      search_bar_banner_ripple_opacity, search_bar_banner_text_opacity,
+      search_panel_x, search_panel_y, search_panel_width, search_panel_height,
+      search_bar_margin_side, search_bar_margin_top, search_bar_height,
+      search_context_opacity, search_text_layer_min_height, search_term_opacity,
       search_term_caption_spacing, search_caption_animation_percentage,
       search_caption_visible, search_bar_border_visible,
       search_bar_border_height, quick_action_icon_visible, thumbnail_visible,
       custom_image_visibility_percentage, bar_image_size, icon_color,
-      drag_handlebar_color, arrow_icon_opacity, arrow_icon_rotation,
-      close_icon_opacity, progress_bar_visible, progress_bar_height,
-      progress_bar_opacity, progress_bar_completion,
+      drag_handlebar_color, close_icon_opacity, progress_bar_visible,
+      progress_bar_height, progress_bar_opacity, progress_bar_completion,
       divider_line_visibility_percentage, divider_line_width,
       divider_line_height, divider_line_color, divider_line_x_offset,
       touch_highlight_visible, touch_highlight_x_offset, touch_highlight_width,

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h

@@ -51,7 +51,6 @@ class ContextualSearchSceneLayer : public SceneLayer,
       jint search_bar_shadow_resource_id,
       jint search_provider_icon_resource_id,
       jint quick_action_icon_resource_id,
-      jint arrow_up_resource_id,
       jint drag_handlebar_resource_id,
       jint open_tab_icon_resource_id,
       jint close_icon_resource_id,
@@ -98,8 +97,6 @@ class ContextualSearchSceneLayer : public SceneLayer,
       jint bar_image_size,
       jint icon_color,
       jint drag_handlebar_color,
-      jfloat arrow_icon_opacity,
-      jfloat arrow_icon_rotation,
       jfloat close_icon_opacity,
       jboolean progress_bar_visible,
       jfloat progress_bar_height,