am 7957eaa6: Merge change Iee9b30d3 into eclair

Merge commit '7957eaa69f069781d8067f8806062330572ff82c' into eclair-plus-aosp * commit '7957eaa69f069781d8067f8806062330572ff82c': New icons
2009-09-29 13:22:02 -07:00
parent ed843820f7 7957eaa69f
commit 03ecab4252
5 changed files with 2 additions and 1 deletions
--- a/core/res/res/drawable-hdpi/sym_def_app_icon.png
+++ b/core/res/res/drawable-hdpi/sym_def_app_icon.png
--- 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/ic_launcher_settings.png
+++ b/packages/SettingsProvider/res/drawable/ic_launcher_settings.png
--- 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">
--- a/packages/TtsService/res/drawable-hdpi/ic_launcher_text_to_speech.png
+++ b/packages/TtsService/res/drawable-hdpi/ic_launcher_text_to_speech.png