[Tab Strip Redesign] replace button icons
- For NTB icon, we use 20dp optical size and 20x20dp for width x height.
- For incognito icon, also use 20dp optical size but 24x24dp for width x height
Folio screenshot: https://screenshot.googleplex.com/AzHTjjuy5JgdcNd
Detached screenshot: https://screenshot.googleplex.com/6rcidpXPsueq9sw
Bug: 1453105
Change-Id: Ia5ca836fb6127cf14c52170f3ed94a659b6c8ee8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4599093
Reviewed-by: Theresa Sullivan <twellington@chromium.org>
Reviewed-by: Neil Coronado <nemco@google.com>
Commit-Queue: Zhe Li <zheliooo@google.com>
Cr-Commit-Position: refs/heads/main@{#1157287}
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
index 278217c..e579b3b3 100644
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -397,6 +397,7 @@
"java/res/drawable/ic_incognito_reauth_promo_icon.xml",
"java/res/drawable/ic_install_webapp.xml",
"java/res/drawable/ic_new_tab_button.xml",
+ "java/res/drawable/ic_new_tab_button_tsr.xml",
"java/res/drawable/ic_new_window.xml",
"java/res/drawable/ic_offer_tag.xml",
"java/res/drawable/ic_open_in_browser.xml",
diff --git a/chrome/android/java/res/drawable/ic_incognito.xml b/chrome/android/java/res/drawable/ic_incognito.xml
index 3fe76d8..9f2ca9f 100644
--- a/chrome/android/java/res/drawable/ic_incognito.xml
+++ b/chrome/android/java/res/drawable/ic_incognito.xml
@@ -6,11 +6,11 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="22dp"
- android:height="22dp"
- android:viewportWidth="48"
- android:viewportHeight="48">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
- android:pathData="M15.05,40Q12.2,40 10.225,38.025Q8.25,36.05 8.25,33.2Q8.25,30.35 10.225,28.375Q12.2,26.4 15.05,26.4Q17.45,26.4 19.35,27.925Q21.25,29.45 21.7,31.95Q22.25,31.7 22.75,31.525Q23.25,31.35 23.85,31.35Q24.45,31.35 25.05,31.525Q25.65,31.7 26.2,31.95Q26.65,29.45 28.55,27.925Q30.45,26.4 32.85,26.4Q35.7,26.4 37.675,28.375Q39.65,30.35 39.65,33.2Q39.65,36.05 37.675,38.025Q35.7,40 32.85,40Q30.45,40 28.65,38.575Q26.85,37.15 26.2,34.75Q25.65,34.45 25.05,34.225Q24.45,34 23.85,34Q23.25,34 22.75,34.225Q22.25,34.45 21.7,34.75Q21.05,37.15 19.25,38.575Q17.45,40 15.05,40ZM15.05,37.5Q16.85,37.5 18.1,36.25Q19.35,35 19.35,33.2Q19.35,31.4 18.1,30.15Q16.85,28.9 15.05,28.9Q13.25,28.9 12,30.15Q10.75,31.4 10.75,33.2Q10.75,35 12,36.25Q13.25,37.5 15.05,37.5ZM15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2Q15.05,33.2 15.05,33.2ZM32.85,37.5Q34.65,37.5 35.9,36.25Q37.15,35 37.15,33.2Q37.15,31.4 35.9,30.15Q34.65,28.9 32.85,28.9Q31.05,28.9 29.8,30.15Q28.55,31.4 28.55,33.2Q28.55,35 29.8,36.25Q31.05,37.5 32.85,37.5ZM32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2Q32.85,33.2 32.85,33.2ZM6,23.5V21H12.6L17.8,7.25Q18.1,6.55 18.65,6.25Q19.2,5.95 19.9,6.15L24,7.35L28.1,6.15Q28.75,5.95 29.35,6.25Q29.95,6.55 30.2,7.25L35.4,21H42V23.5ZM16.2,20.45H31.8L27.9,9.35L24,10.45L20.1,9.35ZM24,20.45H31.8H16.2Z"/>
+ android:pathData="M312,768Q262,768 227,733Q192,698 192,648Q192,598 227,563Q262,528 312,528Q350,528 380,549.5Q410,571 424,606Q437,600 451.5,597.5Q466,595 480,595Q494,595 508.5,597.5Q523,600 536,606Q550,571 580,549.5Q610,528 648,528Q698,528 733,563Q768,598 768,648Q768,698 733,733Q698,768 648,768Q610,768 579,746.5Q548,725 536,690Q525,679 510.5,672.5Q496,666 480,666Q464,666 449.5,672.5Q435,679 424,690Q412,725 381,746.5Q350,768 312,768ZM312,696Q332,696 346,682Q360,668 360,648Q360,628 346,614Q332,600 312,600Q292,600 278,614Q264,628 264,648Q264,668 278,682Q292,696 312,696ZM648,696Q668,696 682,682Q696,668 696,648Q696,628 682,614Q668,600 648,600Q628,600 614,614Q600,628 600,648Q600,668 614,682Q628,696 648,696ZM144,480L144,408L271,408L346,177Q354,158 369,150Q384,142 404,146L480,166L556,146Q576,142 591,150Q606,158 614,177L689,408L816,408L816,480L144,480ZM347,408L613,408L552,222L480,241L408,222L347,408ZM481,404L615,404L615,404L346,404L346,404L481,404Z"/>
</vector>
\ No newline at end of file
diff --git a/chrome/android/java/res/drawable/ic_new_tab_button_tsr.xml b/chrome/android/java/res/drawable/ic_new_tab_button_tsr.xml
new file mode 100644
index 0000000..1d0964d6
--- /dev/null
+++ b/chrome/android/java/res/drawable/ic_new_tab_button_tsr.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2023 The Chromium Authors
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="20dp"
+ android:height="20dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:pathData="M12.997,10.995L12.997,4.995L12.997,4.995C12.997,4.443 12.549,3.995 11.997,3.995C11.445,3.995 10.997,4.443 10.997,4.995L10.997,4.995L10.997,10.995L4.997,10.995L4.997,10.995C4.445,10.995 3.997,11.443 3.997,11.995C3.997,12.548 4.445,12.995 4.997,12.995L10.997,12.995L10.997,18.995L10.997,18.995C10.997,19.548 11.445,19.995 11.997,19.995C12.549,19.995 12.997,19.548 12.997,18.995L12.997,12.995L18.997,12.995L18.997,12.995C19.549,12.995 19.997,12.548 19.997,11.995L19.997,11.995C19.997,11.443 19.549,10.995 18.997,10.995L12.997,10.995Z"
+ android:strokeColor="#00000000"
+ android:fillColor="#000000"
+ android:strokeWidth="1"/>
+</vector>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
index 5fc5bed..93a14dd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
@@ -311,7 +311,7 @@
// different size.
mNewTabButton = new TintedCompositorButton(context,
NEW_TAB_BUTTON_BACKGROUND_WIDTH_DP_TSR, NEW_TAB_BUTTON_BACKGROUND_HEIGHT_DP_TSR,
- newTabClickHandler, R.drawable.ic_new_tab_button);
+ newTabClickHandler, R.drawable.ic_new_tab_button_tsr);
mNewTabButton.setBackgroundResourceId(R.drawable.bg_circle_tab_strip_button);
// Primary container for default bg color.
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayerTest.java
index 8024112..7d6fcd5 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayerTest.java
@@ -106,9 +106,9 @@
mTabStripSceneLayer, ChromeFeatureList.sTabStripRedesign.isEnabled(), false))
.thenReturn(1L);
mModelSelectorButton = new TintedCompositorButton(
- mContext, 36.f, 36.f, mCompositorOnClickHandler, R.drawable.ic_new_tab_button);
+ mContext, 32.f, 32.f, mCompositorOnClickHandler, R.drawable.ic_incognito);
mNewTabButton = new TintedCompositorButton(
- mContext, 36.f, 36.f, mCompositorOnClickHandler, R.drawable.ic_new_tab_button);
+ mContext, 32.f, 32.f, mCompositorOnClickHandler, R.drawable.ic_new_tab_button_tsr);
mStripLayoutTab = new StripLayoutTab(mContext, 1, mStripLayoutTabDelegate,
mTabLoadTrackerCallback, mLayoutRenderHost, mLayoutUpdateHost, false);
mTabStripSceneLayer.initializeNativeForTesting();
