From e92f5df3be0d8111fe5bd83891bb6aad52986dc8 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Wed, 23 Jun 2021 10:36:17 +0100
Subject: [PATCH] Update CA certificate warning to material next spec

* Fix colour extraction
* Update landscape mode
* Update logo

Screenshots:
* https://screenshot.googleplex.com/5mwbKLJeFVecrpi
* https://screenshot.googleplex.com/9z62Sw26NX5Zfwu

Bug: 191845997
Test: Manual testing with Settings
Change-Id: Id9988dbce9eabc2b69dba4bd20ca7a6729601147
---
 res/drawable-hdpi/ic_warning_googred_48dp.png | Bin 603 -> 0 bytes
 res/drawable/ic_alert_red.xml                 |  31 ++++++++++++++++++
 res/layout/ca_certificate_warning_dialog.xml  |  27 ++++-----------
 res/values/strings.xml                        |   2 +-
 .../security/InstallCaCertificateWarning.java |   5 +++
 5 files changed, 44 insertions(+), 21 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_warning_googred_48dp.png
 create mode 100644 res/drawable/ic_alert_red.xml

diff --git a/res/drawable-hdpi/ic_warning_googred_48dp.png b/res/drawable-hdpi/ic_warning_googred_48dp.png
deleted file mode 100644
index 70381dd06bba417985d62217728f0f53ebdf05aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKZ-7sT>uneF!GoMdE~^0@rdJZ=
z7tG+rdh<qck=O^(*|UuP8Xi6r5zhJOVMD##H`$ddY;Bm%olQ;QfAzAjSN)gTwyl~E
z{j(Vu82vq6978JN-d;HybjU$~A+eclqP*b(N0uh0SsfSN|F4j9@N&8_^XA!un_jTL
zcwGL~f47M1*BYto=DksFh9<9n+}XCEH2m-i-V2=nOR5?6{(cZB&miYy&-t4zasET)
z-}BlW7f*3sJmLK38P1QVH(YFq_x)>c+;^(R{&RR=)$Hm%u_;l%YQx@7`4v&wTjZxz
zV>dtBFRH$>$1G&a*AG)qDeYb#k``wE%*S{0`l&Oo<`!@3yLjDsxAE>ZufDC6nR(T>
zpjRTIR=5Amt7SXfd$#Q3QeL}DxMgC{UCB=!K95%$Tw1l;!8l3tw^q-VSI=I!i7Z<0
z<W*|E;x^a5SKV*+&AQracy-G!trgloUM08$ZNGiF*QNCL3%5zTIKK%px37QX5nz5a
z{fNhh&=U*av7BGV7oVHT7vC!LN{=HW@>A$s=eu(jaGeZay=&9@O}pyXcu(KQXsBuD
Vb1`@l2QX3?JYD@<);T3K0RTxy6iomC

diff --git a/res/drawable/ic_alert_red.xml b/res/drawable/ic_alert_red.xml
new file mode 100644
index 00000000000..7b991fb38ef
--- /dev/null
+++ b/res/drawable/ic_alert_red.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/colorError"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M21.26,18L13.73,4.99c-0.77,-1.33 -2.69,-1.33 -3.46,0L2.74,18c-0.77,1.33 0.19,3 1.73,3h15.06C21.07,21 22.03,19.33 21.26,18zM4.47,19L12,5.99L19.53,19H4.47z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11,11v2c0,0.55 0.45,1 1,1c0.55,0 1,-0.45 1,-1v-2c0,-0.55 -0.45,-1 -1,-1C11.45,10 11,10.45 11,11z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,17m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+</vector>
diff --git a/res/layout/ca_certificate_warning_dialog.xml b/res/layout/ca_certificate_warning_dialog.xml
index d863b08aa4b..2bb2b706db5 100644
--- a/res/layout/ca_certificate_warning_dialog.xml
+++ b/res/layout/ca_certificate_warning_dialog.xml
@@ -18,37 +18,24 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:icon="@drawable/ic_alert_red">
 
     <LinearLayout
         style="@style/SudContentFrame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_horizontal">
-
-        <ImageView
-            android:id="@+id/sud_layout_icon"
-            style="@style/SudGlifIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:src="@drawable/ic_warning_googred_48dp"/>
-
-        <TextView
-            android:id="@+id/sud_layout_title"
-            style="@style/SudGlifHeaderTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/ca_certificate_warning_title"/>
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/sud_layout_description"
             style="@style/SudDescription.Glif"
-            android:layout_marginTop="16dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:textSize="18sp"
+            android:alpha="0.7"
             android:text="@string/ca_certificate_warning_description"/>
 
     </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 92a90cea302..83c80c57b77 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6792,7 +6792,7 @@
     <!-- Title of warning shown to the user before they can install a CA certificate [CHAR LIMIT=NONE] -->
     <string name="ca_certificate_warning_title">Your data won\u2019t be private</string>
     <!-- Description of warning shown to the user before they can install a CA certificate [CHAR LIMIT=NONE] -->
-    <string name="ca_certificate_warning_description">CA certificates are used by websites, apps, and VPNs for encryption. Only install CA certificates from organizations you trust. \n\n If you install a CA certificate, the certificate owner could access your data, such as passwords or credit card details, from websites you visit or apps you use – even if your data is encrypted.</string>
+    <string name="ca_certificate_warning_description">CA certificates are used by websites, apps, and VPNs for encryption. Only install CA certificates from organizations you trust. \n\nIf you install a CA certificate, the certificate owner could access your data, such as passwords or credit card details, from websites you visit or apps you use – even if your data is encrypted.</string>
     <!-- Label for button to not install a certificate [CHAR_LIMIT=50] -->
     <string name="certificate_warning_dont_install">Don\u2019t install</string>
     <!-- Label for button to continue installing a certificate [CHAR_LIMIT=50] -->
diff --git a/src/com/android/settings/security/InstallCaCertificateWarning.java b/src/com/android/settings/security/InstallCaCertificateWarning.java
index 91faae1f6a1..38548756a31 100644
--- a/src/com/android/settings/security/InstallCaCertificateWarning.java
+++ b/src/com/android/settings/security/InstallCaCertificateWarning.java
@@ -25,10 +25,12 @@ import android.view.View;
 import android.widget.Toast;
 
 import com.android.settings.R;
+import com.android.settings.SetupWizardUtils;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.GlifLayout;
+import com.google.android.setupdesign.util.ThemeHelper;
 
 /**
  * Creates a warning dialog explaining the consequences of installing a CA certificate
@@ -40,8 +42,11 @@ public class InstallCaCertificateWarning extends Activity {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+        ThemeHelper.trySetDynamicColor(this);
         setContentView(R.layout.ca_certificate_warning_dialog);
         final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
+        layout.setHeaderText(R.string.ca_certificate_warning_title);
 
         final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
         mixin.setSecondaryButton(