[Kartoffel][Clank] Update illustrations
This CL adds the new illustrations to the privacy sandbox consent & notices.
Screenshots: crbug.com/1378703#c161
Bug: 1378703
Change-Id: I9945ebcb3b00adeb725524eb6b1c7c17a5101c61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4106101
Commit-Queue: Nicola Tommasi <tommasin@chromium.org>
Reviewed-by: Rubin Deliallisi <rubindl@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1084221}
diff --git a/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_interests_illustration_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_interests_illustration_v4.xml
index 0c8e581..e448da5 100644
--- a/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_interests_illustration_v4.xml
+++ b/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_interests_illustration_v4.xml
@@ -4,23 +4,29 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<vector android:height="89.805824dp" android:viewportHeight="185"
- android:viewportWidth="412" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="73.68421dp" android:viewportHeight="140"
+ android:viewportWidth="380" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
<group>
- <clip-path android:pathData="M0,0.5h412v184H0z"/>
- <path android:fillColor="#fff" android:pathData="M0,0.5h412v184H0z"/>
- <path android:fillAlpha="0.14" android:fillColor="#5E5E5E" android:pathData="M0,0.5h412v184H0z"/>
- <path android:fillColor="#F8F9FA" android:pathData="M0,0.5h412v184H0z"/>
- <path android:fillColor="#D2E3FC" android:pathData="M55,60c0,-26.23 21.27,-47.5 47.5,-47.5H139c6.07,0 11,4.93 11,11V60c0,26.23 -21.27,47.5 -47.5,47.5S55,86.23 55,60ZM261,60c0,-26.23 21.27,-47.5 47.5,-47.5H345c6.07,0 11,4.93 11,11V60c0,26.23 -21.27,47.5 -47.5,47.5S261,86.23 261,60ZM158,4c0,-26.23 21.27,-47.5 47.5,-47.5H242c6.07,0 11,4.93 11,11V4c0,26.23 -21.27,47.5 -47.5,47.5S158,30.23 158,4ZM55,174c0,-26.23 21.27,-47.5 47.5,-47.5H139c6.07,0 11,4.93 11,11V174c0,26.23 -21.27,47.5 -47.5,47.5S55,200.23 55,174Z"/>
- <path android:fillColor="#1A73E8" android:pathData="M133.83,60.5c0,-17.02 -13.81,-30.83 -30.83,-30.83 -17.02,0 -30.83,13.81 -30.83,30.83 0,17.02 13.81,30.83 30.83,30.83 17.02,0 30.83,-13.81 30.83,-30.83ZM115.33,51.25h-9.25v16.96a7.71,7.71 0,0 1,-7.71 7.71,7.71 7.71,0 0,1 -7.71,-7.71 7.71,7.71 0,0 1,7.71 -7.71c1.76,0 3.33,0.59 4.63,1.57v-16.99h12.33v6.17Z"/>
- <path android:fillColor="#1A73E8" android:fillType="evenOdd" android:pathData="m144.17,19.98 l-1.65,-1.65L136,24.85l-6.52,-6.52 -1.65,1.65 6.52,6.52 -6.52,6.52 1.65,1.65L136,28.15l6.52,6.52 1.65,-1.65 -6.52,-6.52 6.52,-6.52Z"/>
- <path android:fillColor="#A8C7FA" android:fillType="evenOdd" android:pathData="m144.17,136.98 l-1.65,-1.65 -6.52,6.52 -6.52,-6.52 -1.65,1.65 6.52,6.52 -6.52,6.52 1.65,1.65 6.52,-6.52 6.52,6.52 1.65,-1.65 -6.52,-6.52 6.52,-6.52ZM349.17,19.98l-1.65,-1.65L341,24.85l-6.52,-6.52 -1.65,1.65 6.52,6.52 -6.52,6.52 1.65,1.65L341,28.15l6.52,6.52 1.65,-1.65 -6.52,-6.52 6.52,-6.52Z"/>
- <path android:fillColor="#FEEFC3" android:pathData="M158,119c0,-26.23 21.27,-47.5 47.5,-47.5H242c6.07,0 11,4.93 11,11V119c0,26.23 -21.27,47.5 -47.5,47.5S158,145.23 158,119Z"/>
- <path android:fillColor="#F9BC31" android:pathData="M173,125.88c0,-0.79 0.14,-1.52 0.42,-2.17 0.28,-0.65 0.7,-1.26 1.26,-1.82l24.71,-24.71c0.61,-0.61 1.21,-1.03 1.82,-1.26 0.61,-0.28 1.31,-0.42 2.1,-0.42h20.09c1.63,0 2.96,0.56 3.99,1.68 1.07,1.07 1.61,2.38 1.61,3.92v20.02c0,0.79 -0.16,1.54 -0.49,2.24 -0.28,0.7 -0.68,1.31 -1.19,1.82l-24.64,24.64c-0.56,0.56 -1.19,0.98 -1.89,1.26s-1.4,0.42 -2.1,0.42a5.79,5.79 0,0 1,-2.17 -0.42c-0.65,-0.28 -1.26,-0.7 -1.82,-1.26l-20.02,-20.02a6.7,6.7 0,0 1,-1.26 -1.75c-0.28,-0.65 -0.42,-1.38 -0.42,-2.17ZM216.4,112.3c1.17,0 2.15,-0.4 2.94,-1.19 0.84,-0.84 1.26,-1.84 1.26,-3.01 0,-1.17 -0.42,-2.15 -1.26,-2.94 -0.79,-0.84 -1.77,-1.26 -2.94,-1.26s-2.17,0.42 -3.01,1.26c-0.79,0.79 -1.19,1.77 -1.19,2.94s0.4,2.17 1.19,3.01c0.84,0.79 1.84,1.19 3.01,1.19Z"/>
- <path android:fillColor="#F9BC31" android:fillType="evenOdd" android:pathData="m247.17,78.98 l-1.65,-1.65L239,83.85l-6.52,-6.52 -1.65,1.65 6.52,6.52 -6.52,6.52 1.65,1.65L239,87.15l6.52,6.52 1.65,-1.65 -6.52,-6.52 6.52,-6.52Z"/>
- <path android:fillColor="#CEEAD6" android:pathData="M261,174c0,-26.23 21.27,-47.5 47.5,-47.5H345c6.07,0 11,4.93 11,11V174c0,26.23 -21.27,47.5 -47.5,47.5S261,200.23 261,174Z"/>
- <path android:fillColor="#3BA657" android:pathData="M325.52,155.8c-2.86,-0.91 -6,-1.3 -9.02,-1.3 -5.02,0 -10.43,1.04 -14.17,3.89 -3.73,-2.85 -9.15,-3.89 -14.17,-3.89s-10.43,1.04 -14.17,3.89v37.97c0,0.65 0.64,1.3 1.29,1.3 0.26,0 0.39,-0.13 0.64,-0.13 3.48,-1.68 8.5,-2.85 12.24,-2.85 5.02,0 10.43,1.04 14.17,3.89 3.48,-2.2 9.79,-3.89 14.17,-3.89 4.25,0 8.63,0.78 12.24,2.72 0.26,0.13 0.39,0.13 0.64,0.13 0.64,0 1.29,-0.65 1.29,-1.3v-37.84c-1.55,-1.17 -3.22,-1.94 -5.15,-2.59ZM325.52,190.79c-2.83,-0.91 -5.93,-1.3 -9.02,-1.3 -4.38,0 -10.69,1.68 -14.17,3.89v-29.81c3.48,-2.2 9.79,-3.89 14.17,-3.89 3.09,0 6.18,0.39 9.02,1.3v29.81Z"/>
- <path android:fillColor="#3BA657" android:pathData="M316.5,170.05c2.27,0 4.46,0.23 6.44,0.67v-3.94a34.56,34.56 0,0 0,-6.44 -0.62c-4.38,0 -8.35,0.75 -11.59,2.15v4.3c2.91,-1.66 6.95,-2.57 11.59,-2.57ZM304.91,175.21v4.3c2.91,-1.66 6.95,-2.57 11.59,-2.57 2.27,0 4.46,0.23 6.44,0.67v-3.94a34.65,34.65 0,0 0,-6.44 -0.62c-4.38,0 -8.35,0.78 -11.59,2.15ZM316.5,179.98c-4.38,0 -8.35,0.75 -11.59,2.15v4.3c2.91,-1.66 6.95,-2.57 11.59,-2.57 2.27,0 4.46,0.23 6.44,0.67v-3.94c-2.04,-0.41 -4.22,-0.62 -6.44,-0.62Z"/>
- <path android:fillColor="#34A853" android:fillType="evenOdd" android:pathData="m350.17,133.98 l-1.65,-1.65 -6.52,6.52 -6.52,-6.52 -1.65,1.65 6.52,6.52 -6.52,6.52 1.65,1.65 6.52,-6.52 6.52,6.52 1.65,-1.65 -6.52,-6.52 6.52,-6.52Z"/>
+ <clip-path android:pathData="M16,0L364,0A16,16 0,0 1,380 16L380,124A16,16 0,0 1,364 140L16,140A16,16 0,0 1,0 124L0,16A16,16 0,0 1,16 0z"/>
+ <path android:fillColor="#FEEFE3" android:pathData="M16,0L364,0A16,16 0,0 1,380 16L380,124A16,16 0,0 1,364 140L16,140A16,16 0,0 1,0 124L0,16A16,16 0,0 1,16 0z"/>
+ <group>
+ <clip-path android:pathData="M77.68,-63L253.29,-93.97A25.84,25.84 125,0 1,283.22 -73.01L343.71,270.02A25.84,25.84 125,0 1,322.75 299.95L147.14,330.92A25.84,25.84 125,0 1,117.2 309.96L56.72,-33.07A25.84,25.84 125,0 1,77.68 -63z"/>
+ <path android:fillColor="#ffffff" android:pathData="M77.68,-63L253.29,-93.97A25.84,25.84 125,0 1,283.22 -73.01L343.71,270.02A25.84,25.84 125,0 1,322.75 299.95L147.14,330.92A25.84,25.84 125,0 1,117.2 309.96L56.72,-33.07A25.84,25.84 125,0 1,77.68 -63z"/>
+ <path android:fillColor="#D2E3FC" android:pathData="M95.18,18.07L264.57,-11.79A4,4 123.86,0 1,269.21 -8.55L274.76,22.96A4,4 129.71,0 1,271.52 27.6L102.13,57.47A4,4 125.28,0 1,97.5 54.22L91.94,22.71A4,4 55.52,0 1,95.18 18.07z"/>
+ <path android:fillColor="#1A73E8" android:pathData="M111.49,47.18C110.77,47.31 110.11,47.16 109.5,46.74C108.9,46.32 108.54,45.75 108.41,45.03L104.86,24.9L107.32,26.63L109.02,24.17L111.48,25.89L113.2,23.43L115.63,25.16L117.32,22.7L119.76,24.43L121.45,21.98L123.91,23.7L125.63,21.24L128.07,22.97L129.79,20.51L133.34,40.63C133.46,41.35 133.32,42.01 132.89,42.62C132.47,43.22 131.9,43.58 131.18,43.71L111.49,47.18ZM111.03,44.57L119.61,43.05L118.26,35.36L109.67,36.87L111.03,44.57ZM122.14,42.61L130.72,41.1L130.27,38.51L121.68,40.02L122.14,42.61ZM121.24,37.5L129.82,35.99L129.37,33.4L120.78,34.92L121.24,37.5ZM109.22,34.35L128.92,30.88L128.31,27.4L108.61,30.87L109.22,34.35Z"/>
+ <path android:fillColor="#1A73E8" android:pathData="M241.96,21.55L239.82,20.05L245.52,11.87L237.37,6.14L238.86,4L247.04,9.7L252.77,1.55L254.91,3.05L249.21,11.22L257.36,16.96L255.87,19.09L247.69,13.39L241.96,21.55Z"/>
+ <path android:fillColor="#CEEAD6" android:pathData="M102.82,61.4L272.21,31.54A4,4 125.6,0 1,276.85 34.78L282.4,66.3A4,4 128.22,0 1,279.16 70.93L109.77,100.8A4,4 101.52,0 1,105.14 97.55L99.58,66.04A4,4 121.01,0 1,102.82 61.4z"/>
+ <path android:fillColor="#1E8E3E" android:pathData="M126.63,87.51L126.72,85.69C126.73,85.41 126.82,85.16 126.97,84.94C127.14,84.72 127.37,84.58 127.65,84.51L131.44,83.52C131.7,83.43 131.96,83.44 132.21,83.54C132.48,83.64 132.68,83.81 132.8,84.04L133.5,85.13C134.22,84.51 134.84,83.82 135.36,83.05C135.9,82.26 136.31,81.4 136.59,80.49L136.19,80.37C135.93,80.24 135.73,80.08 135.59,79.87C135.45,79.64 135.38,79.39 135.4,79.11L135.59,75.17C135.6,74.9 135.69,74.66 135.84,74.46C136.02,74.26 136.23,74.13 136.47,74.07C136.28,73.57 136.06,73.09 135.81,72.63C135.58,72.16 135.3,71.71 134.97,71.29C134.8,71.42 134.6,71.51 134.38,71.55C134.17,71.56 133.97,71.52 133.79,71.43L130.15,70.04C129.9,69.96 129.7,69.8 129.56,69.57C129.43,69.32 129.36,69.06 129.35,68.79L129.45,67.69C128.76,67.51 128.05,67.42 127.33,67.4C126.63,67.37 125.93,67.42 125.23,67.54C124.92,67.6 124.62,67.66 124.31,67.74C124.03,67.81 123.74,67.9 123.44,68.02L124.77,69.94C124.91,70.17 124.98,70.43 124.97,70.73C124.97,71.01 124.88,71.25 124.68,71.45L122.24,74.51C122.04,74.72 121.81,74.87 121.53,74.96C121.26,75.02 121,75 120.75,74.87L117.62,73.68C117.29,74.56 117.07,75.47 116.96,76.4C116.86,77.32 116.9,78.26 117.07,79.2C117.13,79.55 117.27,80.08 117.47,80.78L120.14,80.06C120.42,79.96 120.69,79.97 120.97,80.07C121.24,80.15 121.44,80.31 121.59,80.56L123.67,83.88C123.82,84.1 123.89,84.36 123.9,84.63C123.9,84.88 123.8,85.11 123.61,85.32L122.65,86.53C123.25,86.83 123.88,87.07 124.55,87.24C125.23,87.4 125.92,87.49 126.63,87.51ZM127.93,81.76C127.67,81.85 127.41,81.84 127.16,81.74C126.91,81.63 126.71,81.47 126.57,81.24L124.17,77.7C124.02,77.45 123.96,77.19 124,76.93C124.03,76.65 124.14,76.41 124.32,76.21L127.01,72.94C127.18,72.72 127.4,72.59 127.67,72.54C127.93,72.47 128.19,72.49 128.44,72.6L132.27,74.01C132.52,74.12 132.73,74.29 132.88,74.54C133.04,74.77 133.12,75.02 133.1,75.3L132.86,79.5C132.85,79.77 132.75,80.02 132.58,80.24C132.42,80.44 132.22,80.58 131.96,80.67L127.93,81.76ZM129.19,90.01C127.45,90.32 125.76,90.28 124.13,89.89C122.49,89.5 121,88.84 119.65,87.92C118.32,86.97 117.19,85.79 116.27,84.39C115.35,82.99 114.73,81.41 114.42,79.67C114.11,77.92 114.16,76.24 114.54,74.6C114.93,72.97 115.59,71.49 116.52,70.16C117.47,68.81 118.64,67.67 120.04,66.75C121.45,65.82 123.02,65.21 124.76,64.9C126.49,64.59 128.17,64.64 129.8,65.03C131.46,65.41 132.95,66.08 134.28,67.03C135.63,67.95 136.76,69.12 137.69,70.52C138.61,71.92 139.23,73.5 139.54,75.24C139.84,76.98 139.8,78.67 139.41,80.31C139.02,81.94 138.36,83.43 137.41,84.79C136.48,86.11 135.3,87.24 133.88,88.17C132.48,89.09 130.92,89.71 129.19,90.01Z"/>
+ <path android:fillColor="#1E8E3E" android:pathData="M249.6,64.88L247.46,63.38L253.16,55.21L245.01,49.47L246.5,47.34L254.68,53.03L260.41,44.88L262.55,46.38L256.85,54.55L265,60.29L263.51,62.42L255.33,56.73L249.6,64.88Z"/>
+ <path android:fillColor="#FEDFC8" android:pathData="M110.49,104.85L279.87,74.98A4,4 121.26,0 1,284.51 78.23L290.06,109.74A4,4 126.81,0 1,286.82 114.37L117.43,144.24A4,4 134.11,0 1,112.8 141L107.24,109.48A4,4 47.34,0 1,110.49 104.85z"/>
+ <path android:fillColor="#E8710A" android:pathData="M134.05,132.68C132.66,132.93 131.38,132.65 130.23,131.86C129.09,131.05 128.4,129.95 128.15,128.58C127.91,127.18 128.18,125.92 128.98,124.78C129.79,123.63 130.89,122.92 132.29,122.68C132.74,122.6 133.17,122.58 133.58,122.64C133.99,122.67 134.39,122.77 134.78,122.94L132.42,109.58L140.24,108.2L141.13,113.28L135.93,114.2L138.16,126.81C138.4,128.19 138.12,129.46 137.3,130.61C136.51,131.75 135.43,132.44 134.05,132.68Z"/>
+ <path android:fillColor="#E8710A" android:pathData="M257.26,108.32L255.12,106.83L260.82,98.65L252.67,92.92L254.16,90.78L262.34,96.48L268.07,88.33L270.21,89.82L264.51,98L272.66,103.73L271.17,105.87L262.99,100.17L257.26,108.32Z"/>
+ <path android:fillColor="#FEEFC3" android:pathData="M118.13,148.18L287.51,118.31A4,4 131.27,0 1,292.15 121.56L297.7,153.07A4,4 124.99,0 1,294.46 157.71L125.07,187.57A4,4 76.33,0 1,120.44 184.33L114.88,152.81A4,4 56.6,0 1,118.13 148.18z"/>
+ <path android:fillColor="#FBBC04" android:pathData="M264.9,151.65L262.76,150.16L268.46,141.98L260.31,136.25L261.8,134.11L269.98,139.81L275.71,131.66L277.85,133.15L272.15,141.33L280.3,147.06L278.81,149.2L270.63,143.5L264.9,151.65Z"/>
+ </group>
+ <path android:fillColor="#00000000"
+ android:pathData="M78.02,-61.04L253.64,-92A23.84,23.84 125,0 1,281.25 -72.66L341.74,270.37A23.84,23.84 125,0 1,322.4 297.98L146.79,328.95A23.84,23.84 125,0 1,119.17 309.61L58.69,-33.42A23.84,23.84 125,0 1,78.02 -61.04z"
+ android:strokeColor="#80868B" android:strokeWidth="4"/>
</group>
</vector>
+
diff --git a/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_notice_eea_illustration_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_notice_eea_illustration_v4.xml
index 14d2029..f59ef5a 100644
--- a/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_notice_eea_illustration_v4.xml
+++ b/chrome/browser/privacy_sandbox/android/java/res/drawable/privacy_sandbox_notice_eea_illustration_v4.xml
@@ -4,97 +4,29 @@
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"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="155dp"
- android:height="124dp"
- android:viewportWidth="155"
- android:viewportHeight="124">
- <path
- android:pathData="M132.02,0L155,10.34V25.97C155,41.01 145.22,54.87 132,59C118.8,54.87 109,41.01 109,25.97V10.34L132.02,0Z"
- android:fillColor="#34A853"/>
- <path
- android:pathData="M16,93V77.09C16,72.08 20.26,68 25.5,68C30.74,68 35,72.08 35,77.09V83.86"
- android:strokeWidth="10.7135"
- android:fillColor="#00000000"
- android:strokeColor="#FBBC04"/>
- <path
- android:pathData="M50,88H0V124H50V88Z"
- android:fillColor="#FBBC04"/>
- <path
- android:pathData="M51,19C53.76,19 56,16.76 56,14C56,11.24 53.76,9 51,9C48.24,9 46,11.24 46,14C46,16.76 48.24,19 51,19Z"
- android:fillColor="#FBBC04"/>
- <path
- android:pathData="M38,105C40.76,105 43,102.76 43,100C43,97.24 40.76,95 38,95C35.24,95 33,97.24 33,100C33,102.76 35.24,105 38,105Z"
- android:fillColor="#3982F8"/>
- <path
- android:pathData="M68.01,119.38L69.39,110.9C69.48,110.32 70.04,109.92 70.62,110.01L79.1,111.39C79.68,111.48 80.08,112.04 79.99,112.62L78.61,121.1C78.52,121.68 77.96,122.08 77.38,121.99L68.9,120.61C68.32,120.52 67.92,119.98 68.01,119.38Z"
- android:fillColor="#34A853"/>
- <path
- android:pathData="M109.84,105H99.16C98.27,105 97.72,105.91 98.15,106.64L103.49,115.45C103.95,116.18 105.05,116.18 105.51,115.45L110.85,106.64C111.28,105.91 110.73,105 109.84,105Z"
- android:fillColor="#3982F8"/>
- <path
- android:pathData="M26.29,47.69L33.66,40.71C34.27,40.12 34.02,39.1 33.2,38.87L23.41,36.04C22.58,35.82 21.83,36.54 22.03,37.36L24.46,47.17C24.67,47.99 25.67,48.28 26.29,47.69Z"
- android:fillColor="#34A853"/>
- <path
- android:pathData="M129.45,89.62C128.3,92.4 125.13,93.74 122.36,92.58C119.59,91.43 118.26,88.24 119.41,85.46L123.55,75.38C124.7,72.6 127.87,71.26 130.64,72.42C133.41,73.57 134.74,76.76 133.59,79.54L129.45,89.62Z"
- android:fillColor="#FBBC04"/>
- <path
- android:pathData="M125.82,42L134.18,41.2C134.88,41.14 135.23,40.4 134.83,39.86L125.02,27.35C124.84,27.11 124.51,26.98 124.18,27L115.82,27.8C115.12,27.86 114.77,28.6 115.17,29.14L124.98,41.65C125.16,41.89 125.49,42.02 125.82,42Z"
- android:fillColor="#FBBC04"/>
- <path
- android:pathData="M79.8,11.26L87.2,12.37L87.88,12.48L91.34,12.99C91.66,13.03 91.99,12.93 92.17,12.69L94.8,9.72C95.01,9.49 95.05,9.19 94.94,8.91L93.45,5.32C93.34,5.04 93.08,4.85 92.75,4.78L89.29,4.27L88.62,4.16L81.24,3.05C78.77,2.69 76.45,4.23 76.06,6.49C75.66,8.76 77.33,10.9 79.8,11.26Z"
- android:fillColor="#3982F8"/>
+<vector android:height="73.68421dp" android:viewportHeight="140"
+ android:viewportWidth="380" android:width="200dp" xmlns:android="http://schemas.android.com/apk/res/android">
<group>
- <clip-path
- android:pathData="M49,31h60v60h-60z"/>
- <path
- android:pathData="M79,76C87.28,76 94,69.28 94,61C94,52.71 87.28,46 79,46C70.72,46 64,52.71 64,61C64,69.28 70.72,76 79,76Z"
- android:fillColor="#ffffff"/>
- <path
- android:pathData="M66.01,68.5L53.02,46C50.39,50.56 49,55.74 49,61C49,66.27 50.39,71.44 53.02,76C55.65,80.56 59.44,84.35 64,86.98C68.56,89.61 73.74,91 79,91L91.99,68.5V68.5C90.67,70.78 88.78,72.67 86.5,73.99C84.22,75.31 81.63,76 79,76C76.37,76 73.78,75.31 71.5,73.99C69.22,72.67 67.33,70.78 66.01,68.5Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="82.25"
- android:startY="89.12"
- android:endX="56.27"
- android:endY="44.13"
- android:type="linear">
- <item android:offset="0" android:color="#FF1E8E3E"/>
- <item android:offset="1" android:color="#FF34A853"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M91.99,68.5L79,91C84.27,91 89.44,89.61 94,86.98C98.56,84.35 102.35,80.56 104.98,76C107.61,71.44 109,66.26 109,61C109,55.73 107.61,50.56 104.98,46H79L79,46C81.63,46 84.22,46.69 86.5,48.01C88.78,49.32 90.67,51.22 91.99,53.5C93.31,55.78 94,58.37 94,61C94,63.63 93.31,66.22 91.99,68.5H91.99Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="74.62"
- android:startY="91.08"
- android:endX="100.6"
- android:endY="46.08"
- android:type="linear">
- <item android:offset="0" android:color="#FFFCC934"/>
- <item android:offset="1" android:color="#FFFBBC04"/>
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:pathData="M79,72.88C85.56,72.88 90.88,67.56 90.88,61C90.88,54.44 85.56,49.13 79,49.13C72.44,49.13 67.13,54.44 67.13,61C67.13,67.56 72.44,72.88 79,72.88Z"
- android:fillColor="#1A73E8"/>
- <path
- android:pathData="M79,46H104.98C102.34,41.44 98.56,37.65 94,35.02C89.44,32.39 84.26,31 79,31C73.73,31 68.56,32.39 64,35.02C59.44,37.65 55.65,41.44 53.02,46L66.01,68.5L66.01,68.5C64.7,66.22 64,63.64 64,61C64,58.37 64.69,55.78 66.01,53.5C67.32,51.22 69.22,49.33 71.5,48.01C73.78,46.69 76.37,46 79,46Z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:startX="53.02"
- android:startY="49.75"
- android:endX="104.98"
- android:endY="49.75"
- android:type="linear">
- <item android:offset="0" android:color="#FFD93025"/>
- <item android:offset="1" android:color="#FFEA4335"/>
- </gradient>
- </aapt:attr>
- </path>
+ <clip-path android:pathData="M16,0L364,0A16,16 0,0 1,380 16L380,124A16,16 0,0 1,364 140L16,140A16,16 0,0 1,0 124L0,16A16,16 0,0 1,16 0z"/>
+ <path android:fillColor="#FEEFE3" android:pathData="M16,0L364,0A16,16 0,0 1,380 16L380,124A16,16 0,0 1,364 140L16,140A16,16 0,0 1,0 124L0,16A16,16 0,0 1,16 0z"/>
+ <path android:fillColor="#00000000"
+ android:pathData="M265,70C265,111.42 231.42,145 190,145C177.76,145 166.21,142.07 156,136.87M261.87,48.5C252.63,17.56 223.95,-5 190,-5C167.74,-5 147.74,4.7 134,20.11M127.52,28.5C119.61,40.38 115,54.65 115,70C115,96.08 128.31,119.04 148.5,132.48"
+ android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="4"/>
+ <path android:fillColor="#00000000"
+ android:pathData="M131,70C131,102.58 157.41,129 190,129C197.11,129 203.92,127.74 210.23,125.44M133.27,53.72C140.34,29.05 163.06,11 190,11C207.62,11 223.44,18.73 234.25,30.97M220.52,120.5C237.59,110.17 249,91.42 249,70C249,58.19 245.53,47.18 239.55,37.96"
+ android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeWidth="3"/>
+ <path android:fillColor="#8AB4F8"
+ android:pathData="M210.6,93.12C205.03,100.79 198.04,105.69 189.6,107.93C181.15,105.69 174.13,100.79 168.51,93.12C162.82,85.23 160,76.52 160,66.94V44.24L189.6,33.14L219.2,44.24V66.94C219.2,76.52 216.34,85.23 210.6,93.12L210.6,93.12Z"
+ android:strokeColor="#1967D2" android:strokeWidth="4"/>
+ <path android:fillColor="#FBBC04" android:pathData="M116.5,51.5m-11.5,-0a11.5,11.5 0,1 0,23 -0a11.5,11.5 0,1 0,-23 -0"/>
+ <path android:fillColor="#4285F4" android:pathData="M158.13,-5.71L144.66,0.88A7.5,7.5 108.18,0 0,141.22 10.91L141.22,10.91A7.5,7.5 108.18,0 0,151.25 14.35L164.73,7.76A7.5,7.5 108.18,0 0,168.17 -2.28L168.17,-2.28A7.5,7.5 108.18,0 0,158.13 -5.71z"/>
+ <path android:fillColor="#D2E3FC" android:pathData="M122.09,90.77L112.85,94.59A2,2 112.87,0 0,111.77 97.21L115.59,106.45A2,2 112.87,0 0,118.21 107.53L127.45,103.7A2,2 112.87,0 0,128.53 101.09L124.7,91.85A2,2 112.87,0 0,122.09 90.77z"/>
+ <path android:fillColor="#D2E3FC" android:pathData="M238.74,8.37L234.42,12.53A2,2 112.5,0 0,234.37 15.36L238.53,19.68A2,2 91.68,0 0,241.36 19.73L245.68,15.57A2,2 91.68,0 0,245.73 12.74L241.57,8.42A2,2 112.5,0 0,238.74 8.37z"/>
+ <path android:fillColor="#34A853" android:pathData="M258,36m8,0a8,8 0,1 0,-16 0a8,8 0,1 0,16 0"/>
+ <path android:fillColor="#4285F4" android:pathData="M238,128m6,0a6,6 0,1 0,-12 0a6,6 0,1 0,12 0"/>
+ <path android:fillColor="#FDC69C" android:pathData="M267.01,76.52C261.81,74.66 256.08,77.37 254.22,82.57L247.48,101.4C245.62,106.6 248.33,112.32 253.53,114.18C258.73,116.04 264.45,113.34 266.31,108.14L273.05,89.31C274.91,84.11 272.21,78.38 267.01,76.52Z"/>
+ <path android:fillColor="#FA7B17" android:pathData="M134.63,123.39C134.19,121.92 135.5,120.53 136.99,120.87L143.8,122.43C145.3,122.77 145.87,124.62 144.81,125.74L140,130.88C138.95,132 137.07,131.56 136.62,130.08L134.63,123.39Z"/>
</group>
</vector>
+
+
diff --git a/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_consent_eea_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_consent_eea_v4.xml
index 4be5754..44f924d 100644
--- a/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_consent_eea_v4.xml
+++ b/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_consent_eea_v4.xml
@@ -47,60 +47,58 @@
android:id="@+id/privacy_sandbox_dialog_scroll_view"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_weight="1"
+ android:fillViewport="true">
<LinearLayout
android:id="@+id/privacy_sandbox_consent_eea_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_horizontal"
+ android:gravity="center_vertical"
+ android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:orientation="vertical">
<ImageView
- android:layout_marginTop="@dimen/privacy_sandbox_dialog_illustration_margin_top"
- android:layout_marginBottom="@dimen/privacy_sandbox_dialog_title_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_height="@dimen/privacy_sandbox_chrome_logo_height"
android:layout_width="@dimen/privacy_sandbox_chrome_logo_width"
+ android:layout_gravity="center"
app:srcCompat="@drawable/chrome_sync_logo"
+ android:layout_marginVertical="@dimen/privacy_sandbox_dialog_logo_margin"
android:importantForAccessibility="no" />
<TextView
android:id="@+id/privacy_sandbox_m1_consent_title"
android:layout_marginBottom="@dimen/privacy_sandbox_dialog_title_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_consent_title"
+ android:layout_gravity="center"
android:gravity="center"
style="@style/TextAppearance.Headline.Primary" />
<TextView
android:layout_marginBottom="@dimen/list_item_default_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_consent_description_1"
style="@style/TextAppearance.TextMedium.Secondary" />
<TextView
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_consent_description_2"
style="@style/TextAppearance.TextMedium.Secondary" />
<ImageView
- android:layout_marginTop="@dimen/privacy_sandbox_dialog_illustration_margin_top"
- android:layout_marginBottom="@dimen/privacy_sandbox_dialog_illustration_margin_bottom"
- android:layout_height="@dimen/privacy_sandbox_interests_illustration_height"
+ android:layout_marginVertical="@dimen/privacy_sandbox_dialog_illustration_margin_vertical"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
app:srcCompat="@drawable/privacy_sandbox_interests_illustration_v4"
+ android:adjustViewBounds="true"
android:importantForAccessibility="no" />
<TextView
android:layout_marginBottom="@dimen/list_item_default_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_consent_description_3"
@@ -108,7 +106,6 @@
<LinearLayout
android:layout_marginBottom="@dimen/list_item_default_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:id="@+id/dropdown_element"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -132,14 +129,12 @@
<LinearLayout
android:id="@+id/dropdown_container"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
<TextView
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_consent_description_4"
@@ -156,9 +151,7 @@
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_dialog_more_button"
android:visibility="invisible"
- android:layout_marginHorizontal="24dp"
- android:layout_marginTop="@dimen/promo_dialog_padding"
- android:layout_marginBottom="@dimen/promo_dialog_padding"
+ android:layout_margin="@dimen/promo_dialog_padding"
style="@style/FilledButton.Flat" />
<LinearLayout
@@ -168,7 +161,6 @@
android:layout_height="wrap_content"
android:weightSum="2"
android:layout_margin="@dimen/promo_dialog_padding"
- android:layout_marginHorizontal="24dp"
android:visibility="gone">
<org.chromium.ui.widget.ButtonCompat
diff --git a/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_eea_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_eea_v4.xml
index 402797b..68182db4 100644
--- a/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_eea_v4.xml
+++ b/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_eea_v4.xml
@@ -38,12 +38,11 @@
android:orientation="vertical">
<ImageView
- android:layout_marginTop="@dimen/privacy_sandbox_dialog_illustration_margin_top"
- android:layout_marginBottom="@dimen/privacy_sandbox_dialog_illustration_margin_bottom"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
+ android:layout_height="@dimen/privacy_sandbox_chrome_logo_height"
+ android:layout_width="@dimen/privacy_sandbox_chrome_logo_width"
android:layout_gravity="center"
- app:srcCompat="@drawable/privacy_sandbox_notice_eea_illustration_v4"
+ app:srcCompat="@drawable/chrome_sync_logo"
+ android:layout_marginVertical="@dimen/privacy_sandbox_dialog_logo_margin"
android:importantForAccessibility="no" />
<TextView
@@ -53,15 +52,23 @@
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_notice_eea_title"
android:layout_gravity="center"
+ android:gravity="center"
style="@style/TextAppearance.Headline.Primary" />
<TextView
- android:layout_marginBottom="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_notice_eea_description_1"
style="@style/TextAppearance.TextMedium.Secondary" />
+ <ImageView
+ android:layout_marginVertical="@dimen/privacy_sandbox_dialog_illustration_margin_vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ app:srcCompat="@drawable/privacy_sandbox_notice_eea_illustration_v4"
+ android:adjustViewBounds="true"
+ android:importantForAccessibility="no" />
+
<TextView
android:id="@+id/privacy_sandbox_m1_notice_eea_bullet_one"
android:layout_marginBottom="@dimen/list_item_default_margin"
@@ -81,6 +88,7 @@
android:id="@+id/dropdown_element"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:orientation="horizontal">
<TextView
diff --git a/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_row_v4.xml b/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_row_v4.xml
index 2cfc0d7..70f6ccb 100644
--- a/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_row_v4.xml
+++ b/chrome/browser/privacy_sandbox/android/java/res/layout/privacy_sandbox_notice_row_v4.xml
@@ -33,12 +33,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
+ android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:orientation="vertical">
<ImageView
android:layout_marginTop="@dimen/privacy_sandbox_dialog_illustration_margin_top"
android:layout_marginBottom="@dimen/privacy_sandbox_dialog_title_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_height="@dimen/privacy_sandbox_chrome_logo_height"
android:layout_width="@dimen/privacy_sandbox_chrome_logo_width"
android:layout_gravity="center"
@@ -48,7 +48,6 @@
<TextView
android:id="@+id/privacy_sandbox_notice_title"
android:layout_marginBottom="@dimen/privacy_sandbox_dialog_title_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -58,30 +57,27 @@
<TextView
android:layout_marginBottom="@dimen/list_item_default_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_notice_row_description_1"
style="@style/TextAppearance.TextMedium.Secondary" />
<TextView
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_notice_row_description_2"
style="@style/TextAppearance.TextMedium.Secondary" />
<ImageView
- android:layout_marginTop="@dimen/privacy_sandbox_dialog_illustration_margin_top"
- android:layout_marginBottom="@dimen/privacy_sandbox_dialog_illustration_margin_bottom"
- android:layout_height="@dimen/privacy_sandbox_interests_illustration_height"
+ android:layout_marginVertical="@dimen/privacy_sandbox_dialog_illustration_margin_vertical"
+ android:layout_height="wrap_content"
android:layout_width="match_parent"
app:srcCompat="@drawable/privacy_sandbox_interests_illustration_v4"
+ android:adjustViewBounds="true"
android:importantForAccessibility="no" />
<TextView
android:layout_marginBottom="@dimen/list_item_default_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_notice_row_description_3"
@@ -89,7 +85,6 @@
<LinearLayout
android:layout_marginBottom="@dimen/list_item_default_margin"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:id="@+id/dropdown_element"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -113,7 +108,6 @@
<LinearLayout
android:id="@+id/dropdown_container"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -121,7 +115,6 @@
<TextView
android:layout_marginBottom="@dimen/privacy_sandbox_notice_margin_bottom"
- android:layout_marginHorizontal="@dimen/list_item_default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/privacy_sandbox_m1_notice_row_description_4"
diff --git a/chrome/browser/privacy_sandbox/android/java/res/values/dimens.xml b/chrome/browser/privacy_sandbox/android/java/res/values/dimens.xml
index edd30b0..2949a42f 100644
--- a/chrome/browser/privacy_sandbox/android/java/res/values/dimens.xml
+++ b/chrome/browser/privacy_sandbox/android/java/res/values/dimens.xml
@@ -10,6 +10,8 @@
<dimen name="privacy_sandbox_illustration_width">120dp</dimen>
<dimen name="privacy_sandbox_dialog_illustration_margin_top">32dp</dimen>
<dimen name="privacy_sandbox_dialog_illustration_margin_bottom">16dp</dimen>
+ <dimen name="privacy_sandbox_dialog_logo_margin">8dp</dimen>
+ <dimen name="privacy_sandbox_dialog_illustration_margin_vertical">16dp</dimen>
<dimen name="privacy_sandbox_dialog_max_width">600dp</dimen>
<dimen name="privacy_sandbox_consent_button_margin_between">8dp</dimen>
<dimen name="privacy_sandbox_notice_button_margin_between">4dp</dimen>
@@ -17,9 +19,8 @@
<dimen name="privacy_sandbox_notice_dialog_dropdown_button_height">24dp</dimen>
<dimen name="privacy_sandbox_notice_margin_bottom">32dp</dimen>
<dimen name="privacy_sandbox_dialog_title_margin">20dp</dimen>
- <dimen name="privacy_sandbox_chrome_logo_width">60dp</dimen>
- <dimen name="privacy_sandbox_chrome_logo_height">61dp</dimen>
- <dimen name="privacy_sandbox_interests_illustration_height">185dp</dimen>
+ <dimen name="privacy_sandbox_chrome_logo_width">40dp</dimen>
+ <dimen name="privacy_sandbox_chrome_logo_height">40dp</dimen>
<dimen name="privacy_sandbox_spinner_dimension">20dp</dimen>
<dimen name="custom_preference_category_paddingVertical">8dp</dimen>
<dimen name="custom_preference_category_title_marginBottom">8dp</dimen>
