Modernize the tablet toolbar

BUG=875541,875542

Change-Id: Ifbf0803605b049a1639a4a609c5fc668c8257658
Reviewed-on: https://chromium-review.googlesource.com/1205791
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589006}

chrome/android/java/res/layout/location_bar_base.xml

@@ -11,7 +11,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout android:id="@+id/location_bar_icon"
-        android:layout_width="@dimen/location_bar_icon_width"
+        android:layout_width="@dimen/location_bar_start_icon_width"
         android:layout_height="match_parent"
         android:paddingEnd="4dp"
         android:visibility="gone" >

chrome/android/java/res/layout/toolbar_tablet.xml

@@ -14,7 +14,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/toolbar_height_no_shadow"
     android:layout_marginTop="@dimen/tab_strip_height"
-    android:background="@color/default_primary_color"
+    android:background="@color/modern_primary_color"
     android:paddingStart="@dimen/tablet_toolbar_start_padding" >
 
     <LinearLayout
@@ -54,12 +54,10 @@
         <org.chromium.chrome.browser.omnibox.LocationBarTablet
             android:id="@+id/location_bar"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
+            android:layout_height="@dimen/modern_toolbar_background_size"
             android:layout_weight="1"
-            android:layout_gravity="top|center"
-            android:background="@drawable/card_single"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/modern_toolbar_background"
             android:paddingEnd="1dp"
             android:paddingStart="2dp" />
 

chrome/android/java/res/values/dimens.xml

@@ -270,6 +270,7 @@
     <dimen name="location_bar_vertical_margin">8dp</dimen>
     <dimen name="location_bar_url_text_size">16sp</dimen>
     <dimen name="location_bar_icon_width">28dp</dimen>
+    <dimen name="location_bar_start_icon_width">28dp</dimen>
     <dimen name="location_bar_lateral_padding">10dp</dimen>
 
     <dimen name="tablet_toolbar_start_padding">4dp</dimen>

chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java

@@ -181,9 +181,8 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
         mNewTabButton = new CompositorButton(
                 context, NEW_TAB_BUTTON_WIDTH_DP, NEW_TAB_BUTTON_HEIGHT_DP, newTabClickHandler);
         mNewTabButton.setResources(R.drawable.btn_tabstrip_new_tab_normal,
-                R.drawable.btn_tabstrip_new_tab_pressed,
-                R.drawable.btn_tabstrip_new_incognito_tab_normal,
-                R.drawable.btn_tabstrip_new_incognito_tab_pressed);
+                R.drawable.btn_tabstrip_new_tab_pressed, R.drawable.btn_tabstrip_new_tab_normal,
+                R.drawable.btn_tabstrip_new_tab_pressed);
         mNewTabButton.setIncognito(incognito);
         mNewTabButton.setY(NEW_TAB_BUTTON_Y_OFFSET_DP);
         mNewTabButton.setClickSlop(NEW_TAB_BUTTON_CLICK_SLOP_DP);

chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java

@@ -41,10 +41,6 @@ public class StripLayoutHelperManager implements SceneOverlay {
     // Caching Variables
     private final RectF mStripFilterArea = new RectF();
 
-    // 1px border colors
-    private static final float BORDER_OPACITY = 0.2f;
-    private static final float BORDER_OPACITY_INCOGNITO = 0.4f;
-
     // Model selector buttons constants.
     private static final float MODEL_SELECTOR_BUTTON_Y_OFFSET_DP = 10.f;
     private static final float MODEL_SELECTOR_BUTTON_END_PADDING_DP = 6.f;
@@ -330,10 +326,6 @@ public class StripLayoutHelperManager implements SceneOverlay {
         return mOrientation;
     }
 
-    public float getBorderOpacity() {
-        return mIsIncognito ? BORDER_OPACITY_INCOGNITO : BORDER_OPACITY;
-    }
-
     /**
      * Updates all internal resources and dimensions.
      * @param context The current Android {@link Context}.

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

@@ -137,8 +137,8 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
                     layoutHelper.getWidth() * mDpToPx, st.getDrawX() * mDpToPx,
                     st.getDrawY() * mDpToPx, st.getWidth() * mDpToPx, st.getHeight() * mDpToPx,
                     st.getContentOffsetX() * mDpToPx, st.getCloseButton().getOpacity(),
-                    st.isLoading(), st.getLoadingSpinnerRotation(), layoutHelper.getBorderOpacity(),
-                    layerTitleCache, resourceManager);
+                    st.isLoading(), st.getLoadingSpinnerRotation(), layerTitleCache,
+                    resourceManager);
         }
     }
 
@@ -167,7 +167,7 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
     private native void nativePutStripTabLayer(long nativeTabStripSceneLayer, int id,
             int closeResourceId, int handleResourceId, boolean foreground, boolean closePressed,
             float toolbarWidth, float x, float y, float width, float height, float contentOffsetX,
-            float closeButtonAlpha, boolean isLoading, float spinnerRotation, float borderOpacity,
+            float closeButtonAlpha, boolean isLoading, float spinnerRotation,
             LayerTitleCache layerTitleCache, ResourceManager resourceManager);
     private native void nativeSetContentTree(long nativeTabStripSceneLayer, SceneLayer contentTree);
 }

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -1070,7 +1070,10 @@ public class LocationBarLayout extends FrameLayout
                 mNavigationButton.setImageDrawable(page);
                 break;
             case NavigationButtonType.MAGNIFIER:
-                mNavigationButton.setImageResource(R.drawable.ic_omnibox_magnifier);
+                Drawable search = TintedDrawable.constructTintedDrawable(getContext(),
+                        R.drawable.omnibox_search,
+                        mUseDarkColors ? R.color.dark_mode_tint : R.color.light_mode_tint);
+                mNavigationButton.setImageDrawable(search);
                 break;
             case NavigationButtonType.EMPTY:
                 mNavigationButton.setImageDrawable(null);

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java

@@ -277,11 +277,6 @@ public class LocationBarTablet extends LocationBarLayout {
         }
     }
 
-    @Override
-    public boolean useModernDesign() {
-        return false;
-    }
-
     /**
      * @param button The {@link View} of the button to show.
      * @return An animator to run for the given view when showing buttons in the unfocused location

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarTablet.java

@@ -17,7 +17,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.StrictModeContext;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
@@ -31,6 +30,7 @@ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.ui.base.DeviceFormFactor;
@@ -42,7 +42,6 @@ import java.util.Collection;
  * The Toolbar object for Tablet screens.
  */
 @SuppressLint("Instantiatable")
-
 public class ToolbarTablet
         extends ToolbarLayout implements OnClickListener, View.OnLongClickListener {
     // The number of toolbar buttons that can be hidden at small widths (reload, back, forward).
@@ -378,11 +377,9 @@ public class ToolbarTablet
         super.onTabOrModelChanged();
         boolean incognito = isIncognito();
         if (mUseLightColorAssets == null || mUseLightColorAssets != incognito) {
-            int colorResource =
-                    incognito ? R.color.incognito_primary_color : R.color.default_primary_color;
-            setBackgroundResource(colorResource);
-            getProgressBar().setThemeColor(
-                    ApiCompatibilityUtils.getColor(getResources(), colorResource), isIncognito());
+            int color = ColorUtils.getDefaultThemeColor(getResources(), true, isIncognito());
+            setBackgroundColor(color);
+            getProgressBar().setThemeColor(color, isIncognito());
 
             getMenuButton().setTint(incognito ? mLightModeTint : mDarkModeTint);
             mHomeButton.setTint(incognito ? mLightModeTint : mDarkModeTint);

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

@@ -37,8 +37,7 @@ void TabHandleLayer::SetProperties(int id,
                                    float close_button_alpha,
                                    bool is_loading,
                                    float spinner_rotation,
-                                   float brightness,
-                                   float border_opacity) {
+                                   float brightness) {
   if (brightness != brightness_ || foreground != foreground_) {
     brightness_ = brightness;
     foreground_ = foreground;
@@ -51,19 +50,8 @@ void TabHandleLayer::SetProperties(int id,
   float original_x = x;
   float original_y = y;
   if (foreground_) {
-    if (!border_->parent()) {
-      layer_->InsertChild(border_, 0);
-      border_->SetIsDrawable(true);
-    }
-    border_->SetBackgroundColor(SK_ColorBLACK);
-    border_->SetPosition(gfx::PointF(0, height - 1));
-    border_->SetBounds(gfx::Size(toolbar_width, 1));
-    border_->SetOpacity(border_opacity);
-
     x = 0;
     y = 0;
-  } else if (border_->parent()) {
-    border_->RemoveFromParent();
   }
 
   bool is_rtl = l10n_util::IsLayoutRtl();
@@ -97,8 +85,6 @@ void TabHandleLayer::SetProperties(int id,
   if (title_layer) {
     title_layer->setOpacity(1.0f);
     unsigned expected_children = 3;
-    if (foreground_)
-      expected_children += 1;
     title_layer_ = title_layer->layer();
     if (layer_->children().size() < expected_children) {
       layer_->AddChild(title_layer_);
@@ -180,7 +166,6 @@ TabHandleLayer::TabHandleLayer(LayerTitleCache* layer_title_cache)
       layer_(cc::Layer::Create()),
       close_button_(cc::UIResourceLayer::Create()),
       decoration_tab_(cc::NinePatchLayer::Create()),
-      border_(cc::SolidColorLayer::Create()),
       brightness_(1.0f),
       foreground_(false) {
   decoration_tab_->SetIsDrawable(true);

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

@@ -46,8 +46,7 @@ class TabHandleLayer : public Layer {
                      float close_button_alpha,
                      bool is_loading,
                      float spinner_rotation,
-                     float brightness,
-                     float border_opacity);
+                     float brightness);
   scoped_refptr<cc::Layer> layer() override;
 
  protected:
@@ -60,7 +59,6 @@ class TabHandleLayer : public Layer {
   scoped_refptr<cc::Layer> layer_;
   scoped_refptr<cc::UIResourceLayer> close_button_;
   scoped_refptr<cc::NinePatchLayer> decoration_tab_;
-  scoped_refptr<cc::SolidColorLayer> border_;
   scoped_refptr<cc::Layer> title_layer_;
 
   float brightness_;

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

@@ -282,7 +282,6 @@ void TabStripSceneLayer::PutStripTabLayer(
     jfloat close_button_alpha,
     jboolean is_loading,
     jfloat spinner_rotation,
-    jfloat border_opacity,
     const JavaParamRef<jobject>& jlayer_title_cache,
     const JavaParamRef<jobject>& jresource_manager) {
   LayerTitleCache* layer_title_cache =
@@ -298,8 +297,7 @@ void TabStripSceneLayer::PutStripTabLayer(
   layer->SetProperties(id, close_button_resource, tab_handle_resource,
                        foreground, close_pressed, toolbar_width, x, y, width,
                        height, content_offset_x, close_button_alpha, is_loading,
-                       spinner_rotation, background_tab_brightness_,
-                       border_opacity);
+                       spinner_rotation, background_tab_brightness_);
 }
 
 scoped_refptr<TabHandleLayer> TabStripSceneLayer::GetNextLayer(

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

@@ -107,7 +107,6 @@ class TabStripSceneLayer : public SceneLayer {
       jfloat close_button_alpha,
       jboolean is_loading,
       jfloat spinner_rotation,
-      jfloat border_opacity,
       const base::android::JavaParamRef<jobject>& jlayer_title_cache,
       const base::android::JavaParamRef<jobject>& jresource_manager);