Snap for 4545621 from f7b09ce3b698818aa666049cb2a45d340841355e to pi-release
Change-Id: I3747d7513edd4a29d1d1c31d54c81efc7e2bab87
diff --git a/res/drawable/ic_account_circle.xml b/res/drawable/ic_account_circle.xml
index a924cd1..5e5fbc5 100644
--- a/res/drawable/ic_account_circle.xml
+++ b/res/drawable/ic_account_circle.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:tint="#61000000">
<path
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"
+ android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z"
android:fillColor="#FFFFFFFF"/>
</vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 2c92dae..6de5db3 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -18,8 +18,8 @@
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
- android:tint="?attr/colorControlNormal">
+ android:tint="#61000000">
<path
- android:fillColor="#4285F4"
- android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M18,13h-5v5c0,0.55-0.45,1-1,1h0c-0.55,0-1-0.45-1-1v-5H6c-0.55,0-1-0.45-1-1v0c0-0.55,0.45-1,1-1h5V6c0-0.55,0.45-1,1-1h0 c0.55,0,1,0.45,1,1v5h5c0.55,0,1,0.45,1,1v0C19,12.55,18.55,13,18,13z" />
</vector>
diff --git a/res/drawable/ic_address_black_24dp.xml b/res/drawable/ic_address_black_24dp.xml
index f5d0209..76176be 100644
--- a/res/drawable/ic_address_black_24dp.xml
+++ b/res/drawable/ic_address_black_24dp.xml
@@ -21,5 +21,5 @@
android:tint="#61000000">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+ android:pathData="M10 20v-6h4v6h4c.55 0 1-.45 1-1v-7h1.7c.46 0 .68-.57.33-.87L12.67 3.6c-.38-.34-.96-.34-1.34 0l-8.36 7.53c-.34.3-.13.87.33.87H5v7c0 .55.45 1 1 1h4z" />
</vector>
diff --git a/res/drawable/ic_allergies_black_24dp.xml b/res/drawable/ic_allergies_black_24dp.xml
index 140dfc3..595cfa2 100644
--- a/res/drawable/ic_allergies_black_24dp.xml
+++ b/res/drawable/ic_allergies_black_24dp.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:tint="#61000000">
<path
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"
+ android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z"
android:fillColor="#FFFFFFFF"/>
</vector>
diff --git a/res/drawable/ic_bloodtype_black_24dp.xml b/res/drawable/ic_bloodtype_black_24dp.xml
index dc21cff..6960f0b 100644
--- a/res/drawable/ic_bloodtype_black_24dp.xml
+++ b/res/drawable/ic_bloodtype_black_24dp.xml
@@ -21,5 +21,5 @@
android:tint="#61000000">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M17.7,7.9L12,2.3L6.3,7.9c-3.1,3.1 -3.1,8.2 0,11.3c1.6,1.6 3.6,2.3 5.7,2.3s4.1,-0.8 5.7,-2.3C20.8,16.1 20.8,11.1 17.7,7.9z"/>
+ android:pathData="M17.7,7.9l-5-4.91c-0.39-0.38-1.01-0.38-1.4,0l-5,4.91c-3.1,3.1-3.1,8.2,0,11.3c1.6,1.6,3.6,2.3,5.7,2.3s4.1-0.8,5.7-2.3 C20.8,16.1,20.8,11.1,17.7,7.9z"/>
</vector>
diff --git a/res/drawable/ic_heart_black_24dp.xml b/res/drawable/ic_heart_black_24dp.xml
index b675eb8..893337a 100644
--- a/res/drawable/ic_heart_black_24dp.xml
+++ b/res/drawable/ic_heart_black_24dp.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:tint="#61000000">
<path
- android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"
+ android:pathData="M12.67 20.74c-.38.34-.96.34-1.34 0l-.78-.71C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76l-.78.7z"
android:fillColor="#FFFFFFFF"/>
</vector>
diff --git a/res/drawable/ic_medication_24dp.xml b/res/drawable/ic_medication_24dp.xml
index cf399e8..41b18ad 100644
--- a/res/drawable/ic_medication_24dp.xml
+++ b/res/drawable/ic_medication_24dp.xml
@@ -21,8 +21,5 @@
android:tint="#61000000">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M5,2.8h14v3h-14z"/>
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M6,6.8v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2v-12H6zM16,15.6H8V8.8h8V15.6z"/>
+ android:pathData="M5.71 3h12.57c.95 0 1.72.67 1.72 1.5S19.23 6 18.29 6H5.71C4.77 6 4 5.33 4 4.5S4.77 3 5.71 3zM6 7v12c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zm10 9H8V9h8v7z"/>
</vector>
diff --git a/res/drawable/ic_mode_edit_24dp.xml b/res/drawable/ic_mode_edit_24dp.xml
index e54e8e9..275f97b 100644
--- a/res/drawable/ic_mode_edit_24dp.xml
+++ b/res/drawable/ic_mode_edit_24dp.xml
@@ -13,8 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<vector android:height="24dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
- android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#FFFFFFFF" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+ android:width="24dp"
+ android:tint="#61000000">
+ <path android:fillColor="#FFFFFFFF" android:pathData="M3 18.08v2.42c0 .28.22.5.5.5h2.42c.53 0 1.04-.21 1.41-.59L17.81 9.94l-3.75-3.75L3.59 16.66c-.38.38-.59.89-.59 1.42zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
</vector>
diff --git a/res/drawable/ic_mode_edit_googblue_24dp.xml b/res/drawable/ic_mode_edit_googblue_24dp.xml
deleted file mode 100644
index f6ad246..0000000
--- a/res/drawable/ic_mode_edit_googblue_24dp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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 android:height="24dp"
- android:viewportHeight="24.0" android:viewportWidth="24.0"
- android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="#4285F4" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/res/drawable/ic_notes_black_24dp.xml b/res/drawable/ic_notes_black_24dp.xml
index a3c0829..1aa9668 100644
--- a/res/drawable/ic_notes_black_24dp.xml
+++ b/res/drawable/ic_notes_black_24dp.xml
@@ -21,6 +21,6 @@
android:viewportHeight="24.0"
android:tint="#61000000">
<path
- android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"
+ android:pathData="M19 3h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm2 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z"
android:fillColor="#FFFFFFFF"/>
</vector>
diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index f537c33..f95e6db 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -93,7 +93,7 @@
<Preference
android:key="edit_medical_info"
- android:icon="@drawable/ic_mode_edit_googblue_24dp"
+ android:icon="@drawable/ic_mode_edit_24dp"
android:title="@string/edit_medical_info">
<intent android:action="android.emergency.EDIT_MEDICAL_INFO"/>
</Preference>