summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorMike Cleron <mcleron@google.com>2009-10-01 11:34:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-01 11:34:19 -0700
commita60a1ef86911c9f2b9a4dbd87a804defca8b2a7c (patch)
treed72c827c0ac8527878579c640eb5af716a84b4cb /packages
parent05bcbd6280e093a2a7d9fdceec603d35a83cc1e5 (diff)
parent03ecab425235bdb5e3548900284e8089c3d72e5e (diff)
downloadframeworks_base-a60a1ef86911c9f2b9a4dbd87a804defca8b2a7c.zip
frameworks_base-a60a1ef86911c9f2b9a4dbd87a804defca8b2a7c.tar.gz
frameworks_base-a60a1ef86911c9f2b9a4dbd87a804defca8b2a7c.tar.bz2
am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair
Merge commit '03ecab425235bdb5e3548900284e8089c3d72e5e' * commit '03ecab425235bdb5e3548900284e8089c3d72e5e': New icons
Diffstat (limited to 'packages')
-rw-r--r--packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.pngbin0 -> 8355 bytes
-rwxr-xr-xpackages/SettingsProvider/res/drawable/ic_launcher_settings.pngbin3285 -> 8355 bytes
-rwxr-xr-xpackages/TtsService/AndroidManifest.xml3
-rw-r--r--packages/TtsService/res/drawable-hdpi/ic_launcher_text_to_speech.pngbin0 -> 6942 bytes
4 files changed, 2 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png b/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png
new file mode 100644
index 0000000..aad82c5
--- /dev/null
+++ b/packages/SettingsProvider/res/drawable-hdpi/ic_launcher_settings.png
Binary files differ
diff --git a/packages/SettingsProvider/res/drawable/ic_launcher_settings.png b/packages/SettingsProvider/res/drawable/ic_launcher_settings.png
index 16db056..aad82c5 100755
--- a/packages/SettingsProvider/res/drawable/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/drawable/ic_launcher_settings.png
Binary files differ
diff --git a/packages/TtsService/AndroidManifest.xml b/packages/TtsService/AndroidManifest.xml
index bd17ba0..46e0ad1 100755
--- a/packages/TtsService/AndroidManifest.xml
+++ b/packages/TtsService/AndroidManifest.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.tts">
- <application android:label="TTS Service">
+ <application android:label="TTS Service"
+ android:icon="@drawable/ic_launcher_text_to_speech">
<service android:enabled="true"
android:name=".TtsService"
android:label="TTS Service">
diff --git a/packages/TtsService/res/drawable-hdpi/ic_launcher_text_to_speech.png b/packages/TtsService/res/drawable-hdpi/ic_launcher_text_to_speech.png
new file mode 100644
index 0000000..3d0c807
--- /dev/null
+++ b/packages/TtsService/res/drawable-hdpi/ic_launcher_text_to_speech.png
Binary files differ