Merge "Import translations. DO NOT MERGE" into ub-contactsdialer-f-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 842d1b7..2058e70 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -348,8 +348,6 @@
android:name=".activities.CompactContactEditorActivity"
android:label="@string/editContactActivityLabel"
android:theme="@style/EditorActivityTheme"
- android:excludeFromRecents="true"
- android:taskAffinity=""
android:windowSoftInputMode="stateHidden|adjustResize">
<intent-filter android:label="@string/editContactDescription">
diff --git a/res/drawable/ic_add_circle_24dp.xml b/res/drawable/ic_add_circle_24dp.xml
index 85a31c0..ae37470 100644
--- a/res/drawable/ic_add_circle_24dp.xml
+++ b/res/drawable/ic_add_circle_24dp.xml
@@ -14,13 +14,14 @@
limitations under the License.
-->
-<!-- A circle with a plus sign in the middle (ic_add_circle) -->
+<!-- Customized ic_add_circle material asset. See b/30018040#comment12 -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
android:height="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
- <path
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"
- android:fillColor="#0288d1"/>
+ android:width="24dp"
+ android:viewportHeight="192.0"
+ android:viewportWidth="192.0">
+ <path android:fillColor="#F5F5F5"
+ android:pathData="M96,8C47.38,8 8,47.38 8,96s39.38,88 88,88s88,-39.38 88,-88S144.62,8 96,8z"/>
+ <path android:fillColor="#039BE5"
+ android:pathData="M124,100h-24v24h-8v-24H68v-8h24V68h8v24h24V100z"/>
</vector>