Update Device Lock dialog for Chrome UI Review

Light: https://screenshot.googleplex.com/3io6tZpcCj8jEHP.png Dark: https://screenshot.googleplex.com/84gCAMEyRrkxviP.png Bug: 1491192 Change-Id: Ib5f1f4ed58013ad1cb8a46058bd8fb8180aeb880 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4922543 Commit-Queue: Charles Hager <clhager@google.com> Reviewed-by: Sinan Sahin <sinansahin@google.com> Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#1209756}
chromium · Oct 14, 2023 · 66f8621 · 66f8621
1 parent a2c1d41
commit 66f8621
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 91 deletions.
diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
@@ -491,9 +491,4 @@ found in the LICENSE file.
     <style name="ModernToolbarPopupTheme">
         <item name="android:listChoiceIndicatorSingle">@drawable/checkmark_selection_drawable</item>
     </style>
-
-    <!-- Device lock dialog styles -->
-    <style name="TextAppearance.DeviceLockNotice" parent="TextAppearance.TextMedium">
-        <item name="android:textColor">@color/default_text_color_error</item>
-    </style>
 </resources>
diff --git a/chrome/browser/ui/android/device_lock/BUILD.gn b/chrome/browser/ui/android/device_lock/BUILD.gn
@@ -36,6 +36,7 @@ android_library("java") {
     "//components/device_reauth:device_reauth_java_enums",
     "//components/signin/public/android:java",
     "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
     "//ui/android:ui_java",
   ]
   resources_package = "org.chromium.chrome.browser.ui.device_lock"

diff --git a/chrome/browser/ui/android/device_lock/java/res/drawable/device_lock_alert_illustration.xml b/chrome/browser/ui/android/device_lock/java/res/drawable/device_lock_alert_illustration.xml
@@ -6,98 +6,100 @@ found in the LICENSE file.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="200dp"
-    android:height="99dp"
+    android:height="97dp"
     android:viewportWidth="200"
-    android:viewportHeight="99">
+    android:viewportHeight="97">
     <path
-        android:pathData="M47.63,82.29L45.93,80.59C45.62,80.28 45.13,80.28 44.82,80.59L43.12,82.29C42.81,82.6 42.81,83.09 43.12,83.4L44.82,85.1C45.13,85.41 45.62,85.41 45.93,85.1L47.63,83.4C47.94,83.09 47.94,82.6 47.63,82.29Z"
+        android:pathData="M39.38,78.89L37.72,77.24C37.42,76.94 36.93,76.94 36.63,77.24L34.98,78.89C34.68,79.19 34.68,79.68 34.98,79.98L36.63,81.64C36.93,81.94 37.42,81.94 37.72,81.64L39.38,79.98C39.68,79.68 39.68,79.19 39.38,78.89Z"
         android:fillColor="@color/device_lock_illustration_bottom_dot"/>
     <path
-        android:pathData="M37.9,43.52C37.52,43.98 37.21,44.49 36.95,45.03L35.93,46.65C35.07,47.99 33.75,48.98 32.22,49.42C30.09,50.11 27.81,50.19 26.41,52.17C25.87,52.95 25.54,53.85 25.46,54.8C25.37,55.74 25.53,56.69 25.92,57.55C25.97,57.64 26.01,57.73 26.06,57.82C26.43,58.51 26.95,59.11 27.58,59.58C28.21,60.05 28.93,60.38 29.7,60.54C30.47,60.71 31.26,60.7 32.03,60.53C32.8,60.35 33.52,60.01 34.14,59.53C34.9,58.96 35.56,58.26 36.26,57.61C37.5,56.45 39.15,55.84 40.85,55.9L42.76,55.97C44.14,56.18 45.54,56.01 46.82,55.49C48.11,54.97 49.23,54.11 50.07,53.01C50.9,51.9 51.43,50.59 51.58,49.21C51.74,47.83 51.52,46.44 50.94,45.17C50.4,43.97 49.56,42.93 48.5,42.14C47.44,41.36 46.2,40.86 44.89,40.69C43.58,40.52 42.26,40.69 41.03,41.19C39.81,41.68 38.73,42.48 37.91,43.51L37.9,43.52Z"
+        android:pathData="M25.17,41.08C24.8,41.54 24.49,42.03 24.24,42.56L23.25,44.14C22.41,45.45 21.12,46.41 19.63,46.84C17.55,47.51 15.33,47.59 13.97,49.52C13.44,50.28 13.12,51.16 13.04,52.08C12.95,53 13.11,53.93 13.49,54.77C13.53,54.85 13.58,54.94 13.62,55.03C13.99,55.7 14.49,56.29 15.11,56.75C15.72,57.21 16.42,57.53 17.17,57.68C17.92,57.84 18.7,57.84 19.45,57.67C20.19,57.5 20.89,57.17 21.5,56.7C22.24,56.14 22.89,55.46 23.57,54.83C24.78,53.7 26.39,53.1 28.05,53.16L29.91,53.23C31.25,53.43 32.62,53.27 33.87,52.76C35.13,52.25 36.22,51.41 37.04,50.33C37.85,49.26 38.36,47.98 38.51,46.63C38.66,45.29 38.45,43.93 37.89,42.7C37.36,41.52 36.55,40.51 35.51,39.74C34.48,38.97 33.27,38.49 31.99,38.32C30.71,38.16 29.42,38.33 28.23,38.81C27.03,39.29 25.98,40.07 25.18,41.07L25.17,41.08Z"
         android:strokeLineJoin="round"
-        android:strokeWidth="0.991503"
+        android:strokeWidth="1.41509"
         android:fillColor="#00000000"
         android:strokeColor="@color/device_lock_illustration_blue"
         android:strokeLineCap="round"/>
     <path
-        android:pathData="M22.17,69.72C27.74,69.72 32.25,65.2 32.25,59.64C32.25,54.07 27.74,49.56 22.17,49.56C16.6,49.56 12.09,54.07 12.09,59.64C12.09,65.2 16.6,69.72 22.17,69.72Z"
-        android:fillColor="@color/device_lock_illustration_left_circle"/>
+        android:pathData="M9.83,66.63C15.26,66.63 19.66,62.23 19.66,56.8C19.66,51.37 15.26,46.97 9.83,46.97C4.4,46.97 0,51.37 0,56.8C0,62.23 4.4,66.63 9.83,66.63Z"
+        android:fillColor="@color/device_lock_illustration_medium_grey"/>
     <group>
         <clip-path
-            android:pathData="M22.17,69.72C27.74,69.72 32.25,65.2 32.25,59.64C32.25,54.07 27.74,49.56 22.17,49.56C16.6,49.56 12.09,54.07 12.09,59.64C12.09,65.2 16.6,69.72 22.17,69.72Z"/>
+            android:pathData="M9.83,66.63C15.26,66.63 19.66,62.23 19.66,56.8C19.66,51.37 15.26,46.97 9.83,46.97C4.4,46.97 0,51.37 0,56.8C0,62.23 4.4,66.63 9.83,66.63Z"/>
         <path
-            android:pathData="M37.9,43.52C37.52,43.98 37.21,44.49 36.95,45.03L35.93,46.65C35.07,47.99 33.75,48.98 32.22,49.42C30.09,50.11 27.81,50.19 26.41,52.17C25.87,52.95 25.54,53.85 25.46,54.8C25.37,55.74 25.53,56.69 25.92,57.55C25.97,57.64 26.01,57.73 26.06,57.82C26.43,58.51 26.95,59.11 27.58,59.58C28.21,60.05 28.93,60.38 29.7,60.54C30.47,60.71 31.26,60.7 32.03,60.53C32.8,60.35 33.52,60.01 34.14,59.53C34.9,58.96 35.56,58.26 36.26,57.61C37.5,56.45 39.15,55.84 40.85,55.9L42.76,55.97C44.14,56.18 45.54,56.01 46.82,55.49C48.11,54.97 49.23,54.11 50.07,53.01C50.9,51.9 51.43,50.59 51.58,49.21C51.74,47.83 51.52,46.44 50.94,45.17C50.4,43.97 49.56,42.93 48.5,42.14C47.44,41.36 46.2,40.86 44.89,40.69C43.58,40.52 42.26,40.69 41.03,41.19C39.81,41.68 38.73,42.48 37.91,43.51L37.9,43.52Z"
+            android:pathData="M25.17,41.08C24.8,41.54 24.49,42.03 24.24,42.56L23.25,44.14C22.41,45.45 21.12,46.41 19.63,46.84C17.55,47.51 15.33,47.59 13.97,49.52C13.44,50.28 13.12,51.16 13.04,52.08C12.95,53 13.11,53.93 13.49,54.77C13.53,54.85 13.58,54.94 13.62,55.03C13.99,55.7 14.49,56.29 15.11,56.75C15.72,57.21 16.42,57.53 17.17,57.68C17.92,57.84 18.7,57.84 19.45,57.67C20.19,57.5 20.89,57.17 21.5,56.7C22.24,56.14 22.89,55.46 23.57,54.83C24.78,53.7 26.39,53.1 28.05,53.16L29.91,53.23C31.25,53.43 32.62,53.27 33.87,52.76C35.13,52.25 36.22,51.41 37.04,50.33C37.85,49.26 38.36,47.98 38.51,46.63C38.66,45.29 38.45,43.93 37.89,42.7C37.36,41.52 36.55,40.51 35.51,39.74C34.48,38.97 33.27,38.49 31.99,38.32C30.71,38.16 29.42,38.33 28.23,38.81C27.03,39.29 25.98,40.07 25.18,41.07L25.17,41.08Z"
             android:strokeLineJoin="round"
-            android:strokeWidth="0.991503"
+            android:strokeWidth="1.41509"
             android:fillColor="#00000000"
             android:strokeColor="@color/device_lock_illustration_screen"
             android:strokeLineCap="round"/>
     </group>
     <path
-        android:pathData="M20.31,25.63C20.31,27.77 18.58,29.5 16.44,29.5C14.31,29.5 12.58,27.77 12.58,25.63C12.58,23.5 14.31,21.76 16.44,21.76C18.58,21.76 20.31,23.5 20.31,25.63Z"
-        android:strokeWidth="0.96732"
+        android:pathData="M12.62,23.64C12.62,25.66 10.98,27.3 8.96,27.3C6.94,27.3 5.31,25.66 5.31,23.64C5.31,21.62 6.94,19.98 8.96,19.98C10.98,19.98 12.62,21.62 12.62,23.64Z"
+        android:strokeWidth="1.17925"
         android:fillColor="#00000000"
         android:strokeColor="@color/device_lock_illustration_green"/>
     <path
-        android:pathData="M193.08,31.29L187.89,29.48C187.48,29.34 187.04,29.3 186.62,29.38C186.2,29.46 185.8,29.65 185.48,29.94L181.32,33.52C180.99,33.8 180.75,34.16 180.6,34.57C180.46,34.97 180.43,35.41 180.51,35.83L181.53,41.22C181.61,41.64 181.8,42.04 182.08,42.36C182.36,42.69 182.73,42.94 183.13,43.08L188.31,44.89C188.72,45.03 189.15,45.07 189.58,44.99C190,44.91 190.39,44.72 190.72,44.44L194.88,40.85C195.21,40.57 195.46,40.21 195.6,39.8C195.74,39.4 195.77,38.96 195.69,38.54L194.67,33.15C194.59,32.73 194.4,32.33 194.12,32.01C193.84,31.68 193.48,31.44 193.08,31.29V31.29Z"
-        android:strokeLineJoin="round"
-        android:strokeWidth="0.991503"
-        android:fillColor="#00000000"
-        android:strokeColor="@color/device_lock_illustration_right_hex"
-        android:strokeLineCap="round"/>
-    <path
-        android:pathData="M154.51,13L153.32,15.07"
-        android:strokeWidth="1.19493"
-        android:fillColor="#00000000"
-        android:strokeColor="@color/device_lock_illustration_screen_top_line"
-        android:strokeLineCap="round"/>
+        android:pathData="M59.43,17.04C56.31,17.04 53.77,19.57 53.77,22.7V76.94C53.77,80.07 56.31,82.6 59.43,82.6H133.49C136.62,82.6 139.15,80.07 139.15,76.94V22.7C139.15,19.57 136.62,17.04 133.49,17.04H59.43Z"
+        android:fillColor="@color/device_lock_illustration_screen"
+        android:fillType="evenOdd"/>
     <path
-        android:pathData="M155.17,18.84L157.56,18.84"
-        android:strokeWidth="1.19493"
+        android:pathData="M54.72,22.7C54.72,20.09 56.83,17.98 59.43,17.98H133.49C136.1,17.98 138.21,20.09 138.21,22.7V76.94C138.21,79.55 136.1,81.66 133.49,81.66H59.43C56.83,81.66 54.72,79.55 54.72,76.94V22.7Z"
+        android:strokeWidth="1.88679"
         android:fillColor="#00000000"
-        android:strokeColor="@color/device_lock_illustration_screen_top_line"
-        android:strokeLineCap="round"/>
-    <path
-        android:pathData="M68.2,19.59L144.13,19.59A5.08,5.08 0,0 1,149.21 24.67L149.21,80.29A5.08,5.08 0,0 1,144.13 85.37L68.2,85.37A5.08,5.08 0,0 1,63.12 80.29L63.12,24.67A5.08,5.08 0,0 1,68.2 19.59z"
-        android:strokeWidth="1.45098"
-        android:fillColor="@color/device_lock_illustration_screen"
         android:strokeColor="@color/device_lock_illustration_screen_outline"/>
     <path
-        android:pathData="M62.39,24.67C62.39,21.46 64.99,18.86 68.2,18.86H144.13C147.34,18.86 149.93,21.46 149.93,24.67V30.47H62.39V24.67Z"
+        android:pathData="M53.77,22.7C53.77,19.57 56.31,17.04 59.43,17.04H133.49C136.62,17.04 139.15,19.57 139.15,22.7V28.36H53.77V22.7Z"
         android:fillColor="@color/device_lock_illustration_screen_header"/>
     <path
-        android:pathData="M86.58,40.63L127.2,40.63A3.39,3.39 0,0 1,130.59 44.01L130.59,44.01A3.39,3.39 0,0 1,127.2 47.4L86.58,47.4A3.39,3.39 0,0 1,83.19 44.01L83.19,44.01A3.39,3.39 0,0 1,86.58 40.63z"
+        android:pathData="M76.18,40.57L117.22,40.57A2.59,2.59 0,0 1,119.81 43.16L119.81,43.16A2.59,2.59 0,0 1,117.22 45.75L76.18,45.75A2.59,2.59 0,0 1,73.58 43.16L73.58,43.16A2.59,2.59 0,0 1,76.18 40.57z"
         android:fillColor="@color/device_lock_illustration_screen_top_line"/>
     <path
-        android:pathData="M140.74,21.52L140.74,21.52A3.14,3.14 0,0 1,143.89 24.67L143.89,24.67A3.14,3.14 0,0 1,140.74 27.81L140.74,27.81A3.14,3.14 0,0 1,137.6 24.67L137.6,24.67A3.14,3.14 0,0 1,140.74 21.52z"
-        android:strokeWidth="1.45098"
-        android:fillColor="@color/device_lock_illustration_red"
-        android:strokeColor="@color/device_lock_illustration_camera_outline"/>
-    <path
-        android:pathData="M85.61,54.17L85.61,54.17A2.42,2.42 0,0 1,88.03 56.59L88.03,56.59A2.42,2.42 0,0 1,85.61 59.01L85.61,59.01A2.42,2.42 0,0 1,83.19 56.59L83.19,56.59A2.42,2.42 0,0 1,85.61 54.17z"
+        android:pathData="M75.47,51.42L75.47,51.42A1.89,1.89 0,0 1,77.36 53.3L77.36,53.3A1.89,1.89 0,0 1,75.47 55.19L75.47,55.19A1.89,1.89 0,0 1,73.58 53.3L73.58,53.3A1.89,1.89 0,0 1,75.47 51.42z"
         android:fillColor="@color/device_lock_illustration_screen_middle_line"/>
     <path
-        android:pathData="M92.38,54.17L118.98,54.17A2.42,2.42 0,0 1,121.4 56.59L121.4,56.59A2.42,2.42 0,0 1,118.98 59.01L92.38,59.01A2.42,2.42 0,0 1,89.96 56.59L89.96,56.59A2.42,2.42 0,0 1,92.38 54.17z"
+        android:pathData="M81.13,51.42L108.02,51.42A1.89,1.89 0,0 1,109.91 53.3L109.91,53.3A1.89,1.89 0,0 1,108.02 55.19L81.13,55.19A1.89,1.89 0,0 1,79.25 53.3L79.25,53.3A1.89,1.89 0,0 1,81.13 51.42z"
         android:fillColor="@color/device_lock_illustration_screen_middle_line"/>
     <path
-        android:pathData="M85.12,62.88L128.65,62.88A1.93,1.93 0,0 1,130.59 64.81L130.59,64.81A1.93,1.93 0,0 1,128.65 66.75L85.12,66.75A1.93,1.93 0,0 1,83.19 64.81L83.19,64.81A1.93,1.93 0,0 1,85.12 62.88z"
+        android:pathData="M74.76,59.91L113.44,59.91A1.18,1.18 0,0 1,114.62 61.08L114.62,61.08A1.18,1.18 0,0 1,113.44 62.26L74.76,62.26A1.18,1.18 0,0 1,73.58 61.08L73.58,61.08A1.18,1.18 0,0 1,74.76 59.91z"
         android:fillColor="@color/device_lock_illustration_screen_bottom_line"/>
     <path
-        android:pathData="M85.12,69.65L113.18,69.65A1.93,1.93 0,0 1,115.11 71.58L115.11,71.58A1.93,1.93 0,0 1,113.18 73.52L85.12,73.52A1.93,1.93 0,0 1,83.19 71.58L83.19,71.58A1.93,1.93 0,0 1,85.12 69.65z"
+        android:pathData="M74.76,65.09L103.54,65.09A1.18,1.18 0,0 1,104.72 66.27L104.72,66.27A1.18,1.18 0,0 1,103.54 67.45L74.76,67.45A1.18,1.18 0,0 1,73.58 66.27L73.58,66.27A1.18,1.18 0,0 1,74.76 65.09z"
         android:fillColor="@color/device_lock_illustration_screen_bottom_line"/>
     <path
-        android:pathData="M159.23,38.29L176.26,68.15C177.37,70.08 175.97,72.49 173.74,72.49H139.67C137.44,72.49 136.04,70.08 137.15,68.15L154.18,38.29C155.3,36.34 158.11,36.34 159.23,38.29Z"
-        android:strokeWidth="1.93464"
-        android:fillColor="@color/device_lock_illustration_yellow"
-        android:strokeColor="@color/device_lock_illustration_yellow"/>
+        android:pathData="M133.96,32.52C133.39,32.72 132.83,32.98 132.29,33.29C127.38,36.13 125.7,42.41 128.53,47.32L132.75,54.62L135.2,53.21L130.99,45.9C128.93,42.35 130.15,37.8 133.71,35.75C133.79,35.7 133.88,35.65 133.96,35.6V32.52ZM142.45,36.71C143,37.21 143.47,37.79 143.86,38.47L148.08,45.77L150.53,44.36L146.31,37.05C145.36,35.4 144.01,34.11 142.45,33.23V36.71Z"
+        android:fillColor="@color/device_lock_illustration_lock_shackle"
+        android:fillType="evenOdd"/>
     <path
-        android:pathData="M156.71,45.79L156.71,45.79A2.58,2.58 0,0 1,159.28 48.37L159.28,59.05A2.58,2.58 0,0 1,156.71 61.62L156.71,61.62A2.58,2.58 0,0 1,154.13 59.05L154.13,48.37A2.58,2.58 0,0 1,156.71 45.79z"
-        android:strokeWidth="1.28369"
-        android:fillColor="@color/device_lock_illustration_screen"
-        android:strokeColor="@color/device_lock_illustration_yellow"/>
+        android:pathData="M130.19,19.63L130.19,19.63A3.07,3.07 0,0 1,133.26 22.7L133.26,22.7A3.07,3.07 0,0 1,130.19 25.76L130.19,25.76A3.07,3.07 0,0 1,127.12 22.7L127.12,22.7A3.07,3.07 0,0 1,130.19 19.63z"
+        android:strokeWidth="1.41509"
+        android:fillColor="@color/device_lock_illustration_red"
+        android:strokeColor="@color/device_lock_illustration_camera_outline"/>
     <path
-        android:pathData="M159.28,65.69L159.28,65.69A2.58,2.58 0,0 1,156.71 68.26L156.71,68.26A2.58,2.58 0,0 1,154.13 65.69L154.13,65.69A2.58,2.58 0,0 1,156.71 63.11L156.71,63.11A2.58,2.58 0,0 1,159.28 65.69z"
-        android:strokeWidth="1.28369"
-        android:fillColor="@color/device_lock_illustration_screen"
-        android:strokeColor="@color/device_lock_illustration_yellow"/>
+        android:pathData="M158.69,35.38L158.16,37.65"
+        android:strokeWidth="1.41509"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/device_lock_illustration_screen_top_line"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M136.1,79.67C136.82,78.98 137.26,78.01 137.26,76.94V44.59L139.15,43.46V76.94C139.15,78.73 138.32,80.33 137.02,81.36L136.1,79.67Z"
+        android:fillColor="@color/device_lock_illustration_medium_grey"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M161.66,41.41L163.89,40.74"
+        android:strokeWidth="1.41509"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/device_lock_illustration_screen_top_line"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M130.88,53.9L151.36,42.07A3.77,3.77 105,0 1,156.52 43.45L167.93,63.22A3.77,3.77 105,0 1,166.55 68.38L146.07,80.21A3.77,3.77 105,0 1,140.91 78.82L129.49,59.05A3.77,3.77 105,0 1,130.88 53.9z"
+        android:fillColor="@color/device_lock_illustration_yellow"/>
+    <path
+        android:pathData="M146.66,61.76C145.36,61.76 144.1,61.08 143.4,59.87C142.35,58.07 142.97,55.76 144.78,54.72C146.58,53.67 148.89,54.29 149.93,56.1C150.63,57.31 150.58,58.74 149.93,59.87L153.03,65.24C153.55,66.15 153.25,67.3 152.34,67.82C151.44,68.34 150.29,68.03 149.77,67.13L146.66,61.76Z"
+        android:fillColor="@color/device_lock_illustration_lock_keyhole"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M188.09,43.87C188.09,46.93 185.61,49.41 182.55,49.41C179.49,49.41 177.01,46.93 177.01,43.87C177.01,40.81 179.49,38.33 182.55,38.33C185.61,38.33 188.09,40.81 188.09,43.87Z"
+        android:strokeWidth="1.17925"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/device_lock_illustration_medium_grey"/>
 </vector>
diff --git a/chrome/browser/ui/android/device_lock/java/res/drawable/rounded_corner_card.xml b/chrome/browser/ui/android/device_lock/java/res/drawable/rounded_corner_card.xml
@@ -4,10 +4,10 @@ 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.
 -->
-
-<shape
+<org.chromium.components.browser_ui.widget.SurfaceColorDrawable
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-  <corners android:radius="@dimen/card_rounded_corner_radius" />
-  <solid android:color="@color/device_lock_illustration_notice_card_background"/>
-</shape>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:shape="rectangle"
+    app:surfaceElevation="@dimen/default_elevation_1">
+  <corners android:radius="@dimen/card_rounded_corner_radius"/>
+</org.chromium.components.browser_ui.widget.SurfaceColorDrawable>
diff --git a/chrome/browser/ui/android/device_lock/java/res/layout/device_lock_view.xml b/chrome/browser/ui/android/device_lock/java/res/layout/device_lock_view.xml
@@ -73,7 +73,7 @@ found in the LICENSE file.
                 android:layout_below="@id/device_lock_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
+                android:layout_margin="20dp"
                 android:padding="16dp"
                 android:layout_gravity="center"
                 android:background="@drawable/rounded_corner_card">
@@ -83,15 +83,14 @@ found in the LICENSE file.
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="start|center_vertical"
-                    android:maxLines="1"
-                    android:drawableStart="@drawable/ic_error_outline_red_24dp"
-                    android:drawablePadding="4dp"
+                    android:drawableStart="@drawable/ic_error_outline_googblue_24dp"
+                    android:drawablePadding="10dp"
                     android:ellipsize="end"
                     android:text="@string/device_lock_notice"
-                    app:drawableTint="@color/device_lock_illustration_red"
-                    app:drawableWidth="18dp"
-                    app:drawableHeight="18dp"
-                    style="@style/TextAppearance.DeviceLockNotice" />
+                    app:drawableTint="@color/default_icon_color_accent1_tint_list"
+                    app:drawableWidth="20dp"
+                    app:drawableHeight="20dp"
+                    style="@style/TextAppearance.TextMedium.Primary" />
 
             </FrameLayout>