Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform...

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8ee8ab6..d731009 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,6 +14,7 @@
         <provider android:name="AlarmProvider" android:authorities="com.android.alarmclock" />
 
         <activity android:name="AlarmClock" android:label="@string/app_label"
+                android:icon="@drawable/ic_widget_analog_clock"
                 android:configChanges="orientation|keyboardHidden|keyboard|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -78,7 +79,8 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name="AnalogAppWidgetProvider" android:label="@string/analog_gadget">
+        <receiver android:name="AnalogAppWidgetProvider" android:label="@string/analog_gadget"
+               android:icon="@drawable/ic_widget_analog_clock">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>

diff --git a/res/drawable-hdpi/ic_widget_analog_clock.png b/res/drawable-hdpi/ic_widget_analog_clock.png
new file mode 100644 (file)
index 0000000..99764c6
Binary files /dev/null and b/res/drawable-hdpi/ic_widget_analog_clock.png differ

diff --git a/res/drawable-mdpi/ic_launcher_alarmclock.png b/res/drawable-mdpi/ic_launcher_alarmclock.png
new file mode 100644 (file)
index 0000000..30ff267
Binary files /dev/null and b/res/drawable-mdpi/ic_launcher_alarmclock.png differ

diff --git a/res/drawable/ic_launcher_alarmclock.png b/res/drawable-mdpi/ic_widget_analog_clock.png
similarity index 100%
rename from res/drawable/ic_launcher_alarmclock.png
rename to res/drawable-mdpi/ic_widget_analog_clock.png