Commit 97c0eef6 authored by Javier Ernesto Flores Robles's avatar Javier Ernesto Flores Robles Committed by Commit Bot

[iOS] Update Tab Strip Assets

Updates the tab strips backgrounds with the new vertical ones. Deletes
unused ones @1x. Updates constants specific to each assets: tab overlap
and cap inset.

Bug: 976817
Change-Id: Ida3b95548ac33c0740c2375eb2153f5bafc569e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1706436Reviewed-by: default avatarRohit Rao <rohitrao@chromium.org>
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#678286}
parent 8e31ad57
...@@ -61,6 +61,7 @@ source_set("tabs") { ...@@ -61,6 +61,7 @@ source_set("tabs") {
"//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list",
"//ios/chrome/common", "//ios/chrome/common",
"//ios/chrome/common:common_extension", "//ios/chrome/common:common_extension",
"//ios/chrome/common/colors",
"//ios/chrome/common/ui_util", "//ios/chrome/common/ui_util",
"//ios/third_party/material_components_ios", "//ios/third_party/material_components_ios",
"//ios/web", "//ios/web",
......
...@@ -17,7 +17,6 @@ imageset("tabstrip_background_tab") { ...@@ -17,7 +17,6 @@ imageset("tabstrip_background_tab") {
sources = [ sources = [
"tabstrip_background_tab.imageset/Contents.json", "tabstrip_background_tab.imageset/Contents.json",
"tabstrip_background_tab.imageset/tabstrip_background_tab@2x~ipad.png", "tabstrip_background_tab.imageset/tabstrip_background_tab@2x~ipad.png",
"tabstrip_background_tab.imageset/tabstrip_background_tab~ipad.png",
] ]
} }
...@@ -25,7 +24,6 @@ imageset("tabstrip_foreground_tab") { ...@@ -25,7 +24,6 @@ imageset("tabstrip_foreground_tab") {
sources = [ sources = [
"tabstrip_foreground_tab.imageset/Contents.json", "tabstrip_foreground_tab.imageset/Contents.json",
"tabstrip_foreground_tab.imageset/tabstrip_foreground_tab@2x~ipad.png", "tabstrip_foreground_tab.imageset/tabstrip_foreground_tab@2x~ipad.png",
"tabstrip_foreground_tab.imageset/tabstrip_foreground_tab~ipad.png",
] ]
} }
...@@ -33,7 +31,6 @@ imageset("tabstrip_incognito_background_tab") { ...@@ -33,7 +31,6 @@ imageset("tabstrip_incognito_background_tab") {
sources = [ sources = [
"tabstrip_incognito_background_tab.imageset/Contents.json", "tabstrip_incognito_background_tab.imageset/Contents.json",
"tabstrip_incognito_background_tab.imageset/tabstrip_incognito_background_tab@2x~ipad.png", "tabstrip_incognito_background_tab.imageset/tabstrip_incognito_background_tab@2x~ipad.png",
"tabstrip_incognito_background_tab.imageset/tabstrip_incognito_background_tab~ipad.png",
] ]
} }
...@@ -41,7 +38,6 @@ imageset("tabstrip_incognito_foreground_tab") { ...@@ -41,7 +38,6 @@ imageset("tabstrip_incognito_foreground_tab") {
sources = [ sources = [
"tabstrip_incognito_foreground_tab.imageset/Contents.json", "tabstrip_incognito_foreground_tab.imageset/Contents.json",
"tabstrip_incognito_foreground_tab.imageset/tabstrip_incognito_foreground_tab@2x~ipad.png", "tabstrip_incognito_foreground_tab.imageset/tabstrip_incognito_foreground_tab@2x~ipad.png",
"tabstrip_incognito_foreground_tab.imageset/tabstrip_incognito_foreground_tab~ipad.png",
] ]
} }
...@@ -49,7 +45,6 @@ imageset("tabstrip_new_tab") { ...@@ -49,7 +45,6 @@ imageset("tabstrip_new_tab") {
sources = [ sources = [
"tabstrip_new_tab.imageset/Contents.json", "tabstrip_new_tab.imageset/Contents.json",
"tabstrip_new_tab.imageset/tabstrip_new_tab@2x~ipad.png", "tabstrip_new_tab.imageset/tabstrip_new_tab@2x~ipad.png",
"tabstrip_new_tab.imageset/tabstrip_new_tab~ipad.png",
] ]
} }
...@@ -57,7 +52,6 @@ imageset("tabstrip_new_tab_incognito") { ...@@ -57,7 +52,6 @@ imageset("tabstrip_new_tab_incognito") {
sources = [ sources = [
"tabstrip_new_tab_incognito.imageset/Contents.json", "tabstrip_new_tab_incognito.imageset/Contents.json",
"tabstrip_new_tab_incognito.imageset/tabstrip_new_tab_incognito@2x~ipad.png", "tabstrip_new_tab_incognito.imageset/tabstrip_new_tab_incognito@2x~ipad.png",
"tabstrip_new_tab_incognito.imageset/tabstrip_new_tab_incognito~ipad.png",
] ]
} }
...@@ -65,7 +59,6 @@ imageset("tabstrip_new_tab_incognito_pressed") { ...@@ -65,7 +59,6 @@ imageset("tabstrip_new_tab_incognito_pressed") {
sources = [ sources = [
"tabstrip_new_tab_incognito_pressed.imageset/Contents.json", "tabstrip_new_tab_incognito_pressed.imageset/Contents.json",
"tabstrip_new_tab_incognito_pressed.imageset/tabstrip_new_tab_incognito_pressed@2x~ipad.png", "tabstrip_new_tab_incognito_pressed.imageset/tabstrip_new_tab_incognito_pressed@2x~ipad.png",
"tabstrip_new_tab_incognito_pressed.imageset/tabstrip_new_tab_incognito_pressed~ipad.png",
] ]
} }
...@@ -73,7 +66,6 @@ imageset("tabstrip_new_tab_pressed") { ...@@ -73,7 +66,6 @@ imageset("tabstrip_new_tab_pressed") {
sources = [ sources = [
"tabstrip_new_tab_pressed.imageset/Contents.json", "tabstrip_new_tab_pressed.imageset/Contents.json",
"tabstrip_new_tab_pressed.imageset/tabstrip_new_tab_pressed@2x~ipad.png", "tabstrip_new_tab_pressed.imageset/tabstrip_new_tab_pressed@2x~ipad.png",
"tabstrip_new_tab_pressed.imageset/tabstrip_new_tab_pressed~ipad.png",
] ]
} }
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_background_tab@2x~ipad.png" "filename": "tabstrip_background_tab@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_background_tab~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_foreground_tab@2x~ipad.png" "filename": "tabstrip_foreground_tab@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_foreground_tab~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_incognito_background_tab@2x~ipad.png" "filename": "tabstrip_incognito_background_tab@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_incognito_background_tab~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_incognito_foreground_tab@2x~ipad.png" "filename": "tabstrip_incognito_foreground_tab@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_incognito_foreground_tab~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_new_tab@2x~ipad.png" "filename": "tabstrip_new_tab@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_new_tab~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_new_tab_incognito@2x~ipad.png" "filename": "tabstrip_new_tab_incognito@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_new_tab_incognito~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_new_tab_incognito_pressed@2x~ipad.png" "filename": "tabstrip_new_tab_incognito_pressed@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_new_tab_incognito_pressed~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -4,11 +4,6 @@ ...@@ -4,11 +4,6 @@
"idiom": "ipad", "idiom": "ipad",
"scale": "2x", "scale": "2x",
"filename": "tabstrip_new_tab_pressed@2x~ipad.png" "filename": "tabstrip_new_tab_pressed@2x~ipad.png"
},
{
"idiom": "ipad",
"scale": "1x",
"filename": "tabstrip_new_tab_pressed~ipad.png"
} }
], ],
"info": { "info": {
......
...@@ -69,7 +69,7 @@ const NSTimeInterval kTabStripFadeAnimationDuration = 0.15; ...@@ -69,7 +69,7 @@ const NSTimeInterval kTabStripFadeAnimationDuration = 0.15;
const NSTimeInterval kDragAndDropLongPressDuration = 0.4; const NSTimeInterval kDragAndDropLongPressDuration = 0.4;
// Tab dimensions. // Tab dimensions.
const CGFloat kTabOverlap = 26.0; const CGFloat kTabOverlap = 32.0;
const CGFloat kTabOverlapForCompactLayout = 30.0; const CGFloat kTabOverlapForCompactLayout = 30.0;
const CGFloat kNewTabOverlap = 13.0; const CGFloat kNewTabOverlap = 13.0;
......
...@@ -41,7 +41,7 @@ const CGFloat kTabCloseTopInset = -1.0; ...@@ -41,7 +41,7 @@ const CGFloat kTabCloseTopInset = -1.0;
const CGFloat kTabCloseLeftInset = 0.0; const CGFloat kTabCloseLeftInset = 0.0;
const CGFloat kTabCloseBottomInset = 0.0; const CGFloat kTabCloseBottomInset = 0.0;
const CGFloat kTabCloseRightInset = 0.0; const CGFloat kTabCloseRightInset = 0.0;
const CGFloat kTabBackgroundLeftCapInset = 24.0; const CGFloat kTabBackgroundLeftCapInset = 34.0;
const CGFloat kFaviconLeftInset = 23.5; const CGFloat kFaviconLeftInset = 23.5;
const CGFloat kFaviconVerticalOffset = 2.0; const CGFloat kFaviconVerticalOffset = 2.0;
const CGFloat kTabStripLineMargin = 2.5; const CGFloat kTabStripLineMargin = 2.5;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment