[Contextual Search] Add support for a static icon

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import org.chromium.chrome.R;
@@ skipping 34 matching lines @@
     * The {@link ContextualSearchCaptionControl} used to control the Caption View.
     */
     private final ContextualSearchCaptionControl mCaptionControl;
 
     /**
      * The {@link ContextualSearchQuickActionControl} used to control quick action behavior.
      */
     private final ContextualSearchQuickActionControl mQuickActionControl;
 
     /**
+     * The {@link ContextualSearchImageControl} for the panel.
+     */
+    private ContextualSearchImageControl mImageControl;
+
+    /**
      * The opacity of the Bar's Search Context.
      */
     private float mSearchBarContextOpacity = 1.f;
 
     /**
      * The opacity of the Bar's Search Term.
      */
     private float mSearchBarTermOpacity = 1.f;
 
     // Dimensions used for laying out the search bar.
     private final float mTextLayerMinHeight;
     private final float mTermCaptionSpacing;
 
     /**
      * Constructs a new bottom bar control container by inflating views from XML.
      *
      * @param panel     The panel.
      * @param context   The context used to build this view.
      * @param container The parent view for the bottom bar views.
      * @param loader    The resource loader that will handle the snapshot capturing.
      */
     public ContextualSearchBarControl(OverlayPanel panel,
                                       Context context,
                                       ViewGroup container,
                                       DynamicResourceLoader loader) {
         mOverlayPanel = panel;
+        mImageControl = new ContextualSearchImageControl(panel, context);
         mContextControl = new ContextualSearchContextControl(panel, context, container, loader);
         mSearchTermControl = new ContextualSearchTermControl(panel, context, container, loader);
         mCaptionControl = new ContextualSearchCaptionControl(panel, context, container, loader);
         mQuickActionControl = new ContextualSearchQuickActionControl();
 
         mTextLayerMinHeight = context.getResources().getDimension(
                 R.dimen.contextual_search_text_layer_min_height);
         mTermCaptionSpacing = context.getResources().getDimension(
                 R.dimen.contextual_search_term_caption_spacing);
     }
 
     /**
+     * @return The {@link ContextualSearchImageControl} for the panel.
+     */
+    public ContextualSearchImageControl getImageControl() {
+        return mImageControl;
+    }
+
+    /**
      * Returns the minimum height that the text layer (containing the Search Context, Term and
      * Caption) should be.
      */
     public float getTextLayerMinHeight() {
         return mTextLayerMinHeight;
     }
 
     /**
      * Returns the spacing that should be placed between the Search Term and Caption.
      */
@@ skipping 99 matching lines @@
      * Sets the quick action if one is available.
      * @param quickActionUri The URI for the intent associated with the quick action.
      * @param quickActionCategory The category for the quick action.
      */
     public void setQuickAction(String quickActionUri, String quickActionCategory) {
         mQuickActionControl.setQuickAction(quickActionUri, quickActionCategory);
         if (mQuickActionControl.hasQuickAction()) {
             // TODO(twellington): should the quick action caption be stored separately from the
             // regular caption?
             mCaptionControl.setCaption(mQuickActionControl.getCaption());
+            mImageControl.setStaticIconResourceId(mQuickActionControl.getIconResId());
         }
     }
 
     /**
      * @return The {@link ContextualSearchQuickActionControl} for the panel.
      */
     public ContextualSearchQuickActionControl getQuickActionControl() {
         return mQuickActionControl;
     }
 
@@ skipping 64 matching lines @@
         // They will both be partially visible for overlapPercentage of the animation duration.
         float overlapPercentage = .75f;
         float fadingOutPercentage = Math.max(1 - (percentage / overlapPercentage), 0.f);
         float fadingInPercentage =
                 Math.max(percentage - (1 - overlapPercentage), 0.f) / overlapPercentage;
 
         mSearchBarContextOpacity = fadingOutPercentage;
         mSearchBarTermOpacity = fadingInPercentage;
     }
 }