Snap for 4638586 from afea4255f5c2392b68953d2cd786664717e49d6b to pi-release
Change-Id: I4dbcc3cd5400830d9821d09ad85f36a7464db809
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 44d542d..d6aff15 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,7 +32,7 @@
android:theme="@style/AppThemeEmergency"
android:taskAffinity="com.android.settings"
android:showOnLockScreen="true"
- android:icon="@mipmap/ic_launcher_settings"
+ android:icon="@drawable/ic_launcher_settings"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.telephony.action.EMERGENCY_ASSISTANCE" />
@@ -42,7 +42,7 @@
<activity
android:name=".edit.EditInfoActivity"
- android:icon="@mipmap/ic_launcher_settings"
+ android:icon="@drawable/ic_launcher_settings"
android:theme="@style/AppTheme"
android:taskAffinity="com.android.settings"
android:launchMode="singleTask">
@@ -73,7 +73,7 @@
<activity
android:name=".edit.EditMedicalInfoActivity"
- android:icon="@mipmap/ic_launcher_settings"
+ android:icon="@drawable/ic_launcher_settings"
android:label="@string/medical_info_title"
android:parentActivityName="com.android.emergency.edit.EditInfoActivity"
android:theme="@style/AppTheme"
diff --git a/res/drawable/ic_launcher_settings.xml b/res/drawable/ic_launcher_settings.xml
new file mode 100644
index 0000000..cd6d497
--- /dev/null
+++ b/res/drawable/ic_launcher_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 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.
+ -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@*android:color/accent_device_default_light"/>
+ <foreground android:drawable="@mipmap/ic_launcher_settings"/>
+</adaptive-icon>
diff --git a/res/mipmap-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
index 252e6b4..ddce98e 100644
--- a/res/mipmap-hdpi/ic_launcher_settings.png
+++ b/res/mipmap-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
index d2ecee9..86f3be8 100644
--- a/res/mipmap-mdpi/ic_launcher_settings.png
+++ b/res/mipmap-mdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_settings.png b/res/mipmap-xhdpi/ic_launcher_settings.png
index fa8c813..360aa69 100644
--- a/res/mipmap-xhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_settings.png b/res/mipmap-xxhdpi/ic_launcher_settings.png
index 3fa69e9..7cb67a9 100644
--- a/res/mipmap-xxhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xxhdpi/ic_launcher_settings.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_settings.png b/res/mipmap-xxxhdpi/ic_launcher_settings.png
index 72946b7..3fec9c4 100644
--- a/res/mipmap-xxxhdpi/ic_launcher_settings.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_settings.png
Binary files differ