diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-10-15 04:02:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 04:02:58 -0700 |
| commit | 7731de83774a61d10d2f2b3d3e0c048997c89b40 (patch) | |
| tree | f48e0ed565fb1bfd8928b483af87531d523b161b /packages/SettingsProvider | |
| parent | 19c71ed7abd9c7bffdf6718954d331172fd633b2 (diff) | |
| parent | 6236cfdf13d86840945f29ec4e7e38642b34eb11 (diff) | |
| download | frameworks_base-7731de83774a61d10d2f2b3d3e0c048997c89b40.zip frameworks_base-7731de83774a61d10d2f2b3d3e0c048997c89b40.tar.gz frameworks_base-7731de83774a61d10d2f2b3d3e0c048997c89b40.tar.bz2 | |
am 6236cfdf: am d0383e37: am 4d0f0692: Merge "Switch settings provider to use the new Settings icon" into klp-dev
* commit '6236cfdf13d86840945f29ec4e7e38642b34eb11':
Switch settings provider to use the new Settings icon
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png | bin | 7230 -> 0 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/drawable-mdpi/ic_launcher_settings.png | bin | 4122 -> 0 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/drawable-xhdpi/ic_launcher_settings.png | bin | 11183 -> 0 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png | bin | 0 -> 8822 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png | bin | 0 -> 5362 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png | bin | 0 -> 12096 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png | bin | 0 -> 20300 bytes | |||
| -rw-r--r-- | packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png | bin | 0 -> 27997 bytes |
9 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/AndroidManifest.xml b/packages/SettingsProvider/AndroidManifest.xml index ab2feb9..783aa03 100644 --- 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" --> diff --git a/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png Binary files differdeleted file mode 100644 index 8a5a2f7..0000000 --- a/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png +++ /dev/null diff --git a/packages/SettingsProvider/res/drawable-mdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/drawable-mdpi/ic_launcher_settings.png Binary files differdeleted file mode 100644 index 803439f..0000000 --- a/packages/SettingsProvider/res/drawable-mdpi/ic_launcher_settings.png +++ /dev/null diff --git a/packages/SettingsProvider/res/drawable-xhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/drawable-xhdpi/ic_launcher_settings.png Binary files differdeleted file mode 100644 index ec3c8ea..0000000 --- a/packages/SettingsProvider/res/drawable-xhdpi/ic_launcher_settings.png +++ /dev/null diff --git a/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png Binary files differnew file mode 100644 index 0000000..a8ccc89 --- /dev/null +++ b/packages/SettingsProvider/res/mipmap-hdpi/ic_launcher_settings.png diff --git a/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png Binary files differnew file mode 100644 index 0000000..69709a8 --- /dev/null +++ b/packages/SettingsProvider/res/mipmap-mdpi/ic_launcher_settings.png diff --git a/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png Binary files differnew file mode 100644 index 0000000..c3adce61 --- /dev/null +++ b/packages/SettingsProvider/res/mipmap-xhdpi/ic_launcher_settings.png diff --git a/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png Binary files differnew file mode 100644 index 0000000..52fe978 --- /dev/null +++ b/packages/SettingsProvider/res/mipmap-xxhdpi/ic_launcher_settings.png diff --git a/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png Binary files differnew file mode 100644 index 0000000..6b92795 --- /dev/null +++ b/packages/SettingsProvider/res/mipmap-xxxhdpi/ic_launcher_settings.png |
