Merge "Switch settings provider to use the new Settings icon" into klp-dev

2013-10-15 00:31:07 +00:00
parent bcfc634db9 8292342e66
commit 4d0f069238
9 changed files with 1 additions and 1 deletions
--- a/packages/SettingsProvider/AndroidManifest.xml
+++ b/packages/SettingsProvider/AndroidManifest.xml
@@ -8,7 +8,7 @@
                 android:process="system"
                 android:backupAgent="SettingsBackupAgent"
                 android:killAfterRestore="false"
-                 android:icon="@drawable/ic_launcher_settings">
+                 android:icon="@mipmap/ic_launcher_settings">
                 
    <!-- todo add: android:neverEncrypt="true" -->

--- a/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/drawable-mdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/drawable-mdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/drawable-xhdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/drawable-xhdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png
--- a/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png