Skip to content

GitLab

T
tangled
Commit 9f8d4632 authored by Erik Luo's avatar Erik Luo Committed by Commit Bot
Browse files
Options

DevTools: update user agents and add Pixel 2 device presets 

Bumps user agents for iOS and Nexus devices, and adds Pixel 2 and its
XL presets.

Retired from show-by-default:
iPhone 7, iPhone 7 Plus, Nexus 6P, Galaxy S5

Added to show-by-default:
iPhone 5, Pixel 2, Pixel 2 XL

Bug: 707877
Change-Id: I1801427ebc622fca46d23fc6e57bfbb6152680d5
Reviewed-on: https://chromium-review.googlesource.com/826247
Commit-Queue: Erik Luo <luoe@chromium.org>
Reviewed-by: default avatarDmitry Gozman <dgozman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524289}
parent c03976e3
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 206 deletions
third_party/WebKit/Source/devtools/front_end/emulated_devices/module.json
View file @ 9f8d4632
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", "user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 7_1_2 like Mac OS X) AppleWebKit/537.51.2 (KHTML, like Gecko) Version/7.0 Mobile/11D257 Safari/9537.53",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 40, "order": 30,
"device": { "device": {
"show-by-default": false, "show-by-default": true,
"title": "iPhone 5", "title": "iPhone 5",
"screen": { "screen": {
"horizontal": { "horizontal": {
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", "user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -83,100 +83,10 @@ ...@@ -83,100 +83,10 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 50, "order": 31,
"device": {
"show-by-default": false,
"title": "iPhone 6",
"screen": {
"horizontal": {
"outline" : {
"image": "@url(iPhone6-landscape.svg)",
"insets" : { "left": 106, "top": 28, "right": 106, "bottom": 28 }
},
"width": 667,
"height": 375
},
"device-pixel-ratio": 2,
"vertical": {
"outline" : {
"image": "@url(iPhone6-portrait.svg)",
"insets" : { "left": 28, "top": 105, "right": 28, "bottom": 105 }
},
"width": 375,
"height": 667
}
},
"capabilities": [
"touch",
"mobile"
],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
"type": "phone",
"modes": [
{
"title": "default",
"orientation": "vertical",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
},
{
"title": "default",
"orientation": "horizontal",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
}
]
}
},
{
"type": "emulated-device",
"order": 60,
"device": {
"show-by-default": false,
"title": "iPhone 6 Plus",
"screen": {
"horizontal": {
"outline" : {
"image": "@url(iPhone6Plus-landscape.svg)",
"insets" : { "left": 109, "top": 29, "right": 109, "bottom": 27 }
},
"width": 736,
"height": 414
},
"device-pixel-ratio": 3,
"vertical": {
"outline" : {
"image": "@url(iPhone6Plus-portrait.svg)",
"insets" : { "left": 26, "top": 107, "right": 30, "bottom": 111 }
},
"width": 414,
"height": 736
}
},
"capabilities": [
"touch",
"mobile"
],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
"type": "phone",
"modes": [
{
"title": "default",
"orientation": "vertical",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
},
{
"title": "default",
"orientation": "horizontal",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
}
]
}
},
{
"type": "emulated-device",
"order": 61,
"device": { "device": {
"show-by-default": true, "show-by-default": true,
"title": "iPhone 7", "title": "iPhone 6/7/8",
"screen": { "screen": {
"horizontal": { "horizontal": {
"outline" : { "outline" : {
...@@ -200,7 +110,7 @@ ...@@ -200,7 +110,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1", "user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -218,10 +128,10 @@ ...@@ -218,10 +128,10 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 62, "order": 32,
"device": { "device": {
"show-by-default": true, "show-by-default": true,
"title": "iPhone 7 Plus", "title": "iPhone 6/7/8 Plus",
"screen": { "screen": {
"horizontal": { "horizontal": {
"outline" : { "outline" : {
...@@ -245,7 +155,7 @@ ...@@ -245,7 +155,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1", "user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -263,97 +173,7 @@ ...@@ -263,97 +173,7 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 63, "order": 33,
"device": {
"show-by-default": true,
"title": "iPhone 8",
"screen": {
"horizontal": {
"outline" : {
"image": "@url(iPhone6-landscape.svg)",
"insets" : { "left": 106, "top": 28, "right": 106, "bottom": 28 }
},
"width": 667,
"height": 375
},
"device-pixel-ratio": 2,
"vertical": {
"outline" : {
"image": "@url(iPhone6-portrait.svg)",
"insets" : { "left": 28, "top": 105, "right": 28, "bottom": 105 }
},
"width": 375,
"height": 667
}
},
"capabilities": [
"touch",
"mobile"
],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1",
"type": "phone",
"modes": [
{
"title": "default",
"orientation": "vertical",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
},
{
"title": "default",
"orientation": "horizontal",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
}
]
}
},
{
"type": "emulated-device",
"order": 64,
"device": {
"show-by-default": true,
"title": "iPhone 8 Plus",
"screen": {
"horizontal": {
"outline" : {
"image": "@url(iPhone6Plus-landscape.svg)",
"insets" : { "left": 109, "top": 29, "right": 109, "bottom": 27 }
},
"width": 736,
"height": 414
},
"device-pixel-ratio": 3,
"vertical": {
"outline" : {
"image": "@url(iPhone6Plus-portrait.svg)",
"insets" : { "left": 26, "top": 107, "right": 30, "bottom": 111 }
},
"width": 414,
"height": 736
}
},
"capabilities": [
"touch",
"mobile"
],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1",
"type": "phone",
"modes": [
{
"title": "default",
"orientation": "vertical",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
},
{
"title": "default",
"orientation": "horizontal",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
}
]
}
},
{
"type": "emulated-device",
"order": 65,
"device": { "device": {
"show-by-default": true, "show-by-default": true,
"title": "iPhone X", "title": "iPhone X",
...@@ -372,7 +192,7 @@ ...@@ -372,7 +192,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1", "user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -524,16 +344,15 @@ ...@@ -524,16 +344,15 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 20,
"device": { "device": {
"title": "Nexus 5X", "title": "Nexus 5X",
"type": "phone", "type": "phone",
"user-agent": "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36", "user-agent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 5X Build/OPR4.170623.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36",
"capabilities": [ "capabilities": [
"touch", "touch",
"mobile" "mobile"
], ],
"show-by-default": true, "show-by-default": false,
"screen": { "screen": {
"device-pixel-ratio": 2.625, "device-pixel-ratio": 2.625,
"vertical": { "vertical": {
...@@ -613,7 +432,7 @@ ...@@ -613,7 +432,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36", "user-agent": "Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6 Build/N6F26U) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -631,9 +450,8 @@ ...@@ -631,9 +450,8 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 30,
"device": { "device": {
"show-by-default": true, "show-by-default": false,
"title": "Nexus 6P", "title": "Nexus 6P",
"screen": { "screen": {
"horizontal": { "horizontal": {
...@@ -658,7 +476,81 @@ ...@@ -658,7 +476,81 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36", "user-agent": "Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36",
"type": "phone",
"modes": [
{
"title": "default",
"orientation": "vertical",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
},
{
"title": "default",
"orientation": "horizontal",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
}
]
}
},
{
"type": "emulated-device",
"order": 20,
"device": {
"show-by-default": true,
"title": "Pixel 2",
"screen": {
"horizontal": {
"width": 731,
"height": 411
},
"device-pixel-ratio": 2.625,
"vertical": {
"width": 411,
"height": 731
}
},
"capabilities": [
"touch",
"mobile"
],
"user-agent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36",
"type": "phone",
"modes": [
{
"title": "default",
"orientation": "vertical",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
},
{
"title": "default",
"orientation": "horizontal",
"insets": { "left": 0, "top": 0, "right": 0, "bottom": 0 }
}
]
}
},
{
"type": "emulated-device",
"order": 21,
"device": {
"show-by-default": true,
"title": "Pixel 2 XL",
"screen": {
"horizontal": {
"width": 823,
"height": 411
},
"device-pixel-ratio": 3.5,
"vertical": {
"width": 411,
"height": 823
}
},
"capabilities": [
"touch",
"mobile"
],
"user-agent": "Mozilla/5.0 (Linux; Android 8.0.0; Pixel 2 XL Build/OPD1.170816.004) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36",
"type": "phone", "type": "phone",
"modes": [ "modes": [
{ {
...@@ -983,7 +875,7 @@ ...@@ -983,7 +875,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", "user-agent": "Mozilla/5.0 (iPad; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) Version/11.0 Mobile/15A5341f Safari/604.1",
"type": "tablet", "type": "tablet",
"modes": [ "modes": [
{ {
...@@ -1001,7 +893,7 @@ ...@@ -1001,7 +893,7 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 70, "order": 40,
"device": { "device": {
"show-by-default": true, "show-by-default": true,
"title": "iPad", "title": "iPad",
...@@ -1028,7 +920,7 @@ ...@@ -1028,7 +920,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", "user-agent": "Mozilla/5.0 (iPad; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) Version/11.0 Mobile/15A5341f Safari/604.1",
"type": "tablet", "type": "tablet",
"modes": [ "modes": [
{ {
...@@ -1046,7 +938,7 @@ ...@@ -1046,7 +938,7 @@
}, },
{ {
"type": "emulated-device", "type": "emulated-device",
"order": 80, "order": 41,
"device": { "device": {
"show-by-default": true, "show-by-default": true,
"title": "iPad Pro", "title": "iPad Pro",
...@@ -1065,7 +957,7 @@ ...@@ -1065,7 +957,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1", "user-agent": "Mozilla/5.0 (iPad; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.34 (KHTML, like Gecko) Version/11.0 Mobile/15A5341f Safari/604.1",
"type": "tablet", "type": "tablet",
"modes": [ "modes": [
{ {
...@@ -1137,7 +1029,7 @@ ...@@ -1137,7 +1029,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36", "user-agent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 10 Build/MOB31T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36",
"type": "tablet", "type": "tablet",
"modes": [ "modes": [
{ {
...@@ -1173,7 +1065,7 @@ ...@@ -1173,7 +1065,7 @@
"touch", "touch",
"mobile" "mobile"
], ],
"user-agent": "Mozilla/5.0 (Linux; Android 4.3; Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36", "user-agent": "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 7 Build/MOB30X) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36",
"type": "tablet", "type": "tablet",
"modes": [ "modes": [
{ {
......
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