Merge Android 12HEADmaster

Bug: 202323961
Merged-In: I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24
Change-Id: Ib2ecaa196b974cec584f6ae5c1e8b4092818d73a

10 files changed, 75 insertions, 11 deletions

diff --git a/res/drawable/ic_briefcase.xml b/res/drawable/ic_briefcase.xml
index cf979ac1c..64efd18d9 100644
--- a/res/drawable/ic_briefcase.xml
+++ b/res/drawable/ic_briefcase.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/briefcase_icon_color"
+      android:fillColor="?android:attr/colorAccent"
       android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"/>
 </vector>
diff --git a/res/drawable/ic_check.xml b/res/drawable/ic_check.xml
index a6df08a93..2f02c9a6c 100644
--- a/res/drawable/ic_check.xml
+++ b/res/drawable/ic_check.xml
@@ -18,7 +18,7 @@ Copyright (C) 2018 The Android Open Source Project
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/colorPrimary">
+        android:tint="?android:colorControlActivated">
     <path
         android:fillColor="@android:color/white"
         android:pathData="vM9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
diff --git a/res/drawable/ic_check_circle.xml b/res/drawable/ic_check_circle.xml
index 13b45bd8e..62a4e34b4 100644
--- a/res/drawable/ic_check_circle.xml
+++ b/res/drawable/ic_check_circle.xml
@@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:attr/colorPrimary"
+        android:fillColor="?android:attr/colorAccent"
         android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>
 </vector>
diff --git a/res/drawable/ic_dialog_info.xml b/res/drawable/ic_dialog_info.xml
index 2e2447b69..968bb67dd 100644
--- a/res/drawable/ic_dialog_info.xml
+++ b/res/drawable/ic_dialog_info.xml
@@ -19,7 +19,7 @@
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?android:attr/colorPrimary">
+        android:tint="?android:attr/colorAccent">
     <path
         android:fillColor="?android:attr/colorBackground"
         android:pathData="M11 15h2v2h-2v-2zm0-8h2v6h-2V7zm0.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />
diff --git a/res/drawable/ic_done.xml b/res/drawable/ic_done.xml
index f8f66b692..299bd177f 100644
--- a/res/drawable/ic_done.xml
+++ b/res/drawable/ic_done.xml
@@ -19,6 +19,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorPrimary"
+        android:fillColor="?android:colorAccent"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/res/drawable/launcher_screen.xml b/res/drawable/launcher_screen.xml
index 485160615..c0d814632 100644
--- a/res/drawable/launcher_screen.xml
+++ b/res/drawable/launcher_screen.xml
@@ -3,7 +3,7 @@
   <item android:drawable="@android:color/white"/>
 
   <item
-      android:drawable="@drawable/app_icon"
+      android:drawable="@drawable/splash_screen"
       android:height="150dp"
       android:width="150dp"
       android:gravity="center"/>
diff --git a/res/drawable/launcher_screen_night.xml b/res/drawable/launcher_screen_night.xml
index 8a9ffd3a6..983c4977d 100644
--- a/res/drawable/launcher_screen_night.xml
+++ b/res/drawable/launcher_screen_night.xml
@@ -3,7 +3,7 @@
   <item android:drawable="@color/app_background_color"/>
 
   <item
-      android:drawable="@drawable/app_icon"
+      android:drawable="@drawable/splash_screen"
       android:height="150dp"
       android:width="150dp"
       android:gravity="center"/>
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
index 5768aff8a..5067af08e 100644
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -16,7 +16,7 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:tint="?android:attr/colorForeground">
-    <solid android:color="#1f000000" />
+    <solid android:color="@color/list_divider_color" />
     <size
         android:height="1dp"
         android:width="1dp" />
diff --git a/res/drawable/list_item_background.xml b/res/drawable/list_item_background.xml
index afbeecd27..a73ae2e2a 100644
--- a/res/drawable/list_item_background.xml
+++ b/res/drawable/list_item_background.xml
@@ -16,16 +16,16 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_focused="true" >
-        <color android:color="?android:colorSecondary"/>
+        <color android:color="@color/list_item_selected_background_color"/>
     </item>
     <item android:state_selected="true">
-        <color android:color="?android:colorSecondary"/>
+        <color android:color="@color/list_item_selected_background_color"/>
     </item>
     <item android:state_drag_hovered="true">
         <color android:color="?android:strokeColor"/>
     </item>
     <item android:state_selected="false"
           android:state_focused="false">
-        <color android:color="@color/app_background_color"/>
+        <color android:color="?android:attr/colorBackground"/>
     </item>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/splash_screen.xml b/res/drawable/splash_screen.xml
new file mode 100644
index 000000000..3f0c48b6b
--- /dev/null
+++ b/res/drawable/splash_screen.xml
@@ -0,0 +1,64 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M23,12c0,6.1 -4.9,11 -11,11S1,18.1 1,12c0,0 0,0 0,-0.1c0,6 4.9,10.9 11,10.9S23,18 23,12C23,12 23,12 23,12z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#263238"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M23,12C23,12 23,12 23,12c0,-6 -4.9,-10.9 -11,-10.9S1,6 1,12.1c0,0 0,0 0,-0.1C1,5.9 5.9,1 12,1S23,5.9 23,12z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M22.8,14.2c-1,4.8 -5,8.4 -9.9,8.8l-6.4,-6.4L17.6,9C17.6,9 22.8,14.2 22.8,14.2z"
+      android:fillColor="#4285F4"/>
+  <path
+      android:pathData="M22.8,14.2c-1,4.8 -5,8.4 -9.9,8.8l-6.4,-6.4L17.6,9C17.6,9 22.8,14.2 22.8,14.2z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startY="12.203438"
+          android:startX="11.452812"
+          android:endY="20.219812"
+          android:endX="19.469187"
+          android:type="linear">
+        <item android:offset="0" android:color="#33263238"/>
+        <item android:offset="1" android:color="#05263238"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M16.5,8.5H12L10.8,7H7.5C6.7,7 6,7.7 6,8.5v7C6,16.3 6.7,17 7.5,17h9c0.8,0 1.5,-0.7 1.5,-1.5V10C18,9.2 17.3,8.5 16.5,8.5z"
+      android:fillColor="#F5F5F5"/>
+  <path
+      android:pathData="M18,10v0.1c0,-0.8 -0.7,-1.5 -1.5,-1.5H12l-1.2,-1.5H7.5C6.7,7.1 6,7.8 6,8.6V8.5C6,7.7 6.7,7 7.5,7h3.2L12,8.5h4.5C17.3,8.5 18,9.2 18,10z"
+      android:strokeAlpha="0.4"
+      android:fillColor="#FFFFFF"
+      android:fillAlpha="0.4"/>
+  <path
+      android:pathData="M18,15.5v0.1c0,0.8 -0.7,1.5 -1.5,1.5h-9c-0.8,0 -1.5,-0.7 -1.5,-1.5v-0.1C6,16.3 6.7,17 7.5,17h9C17.3,17 18,16.3 18,15.5z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#263238"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:fillAlpha="0.1">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:gradientRadius="22.333876"
+          android:centerX="3.238875"
+          android:centerY="5.0445"
+          android:type="radial">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#00FFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>