am 51cef844: Merge change Ic7e251a7 into eclair

Merge commit '51cef8440df1971f06e41eba8a87c58a225d4e8f' into eclair-plus-aosp

* commit '51cef8440df1971f06e41eba8a87c58a225d4e8f':
  Update SD card notification icons.

api/current.xml

@@ -10956,6 +10956,17 @@
  visibility="public"
 >
 </field>
+<field name="stat_notify_sdcard_prepare"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="17301675"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="stat_notify_sdcard_usb"
  type="int"
  transient="false"

core/res/res/values/public.xml

@@ -1193,4 +1193,5 @@
        can be seen. -->
   <public type="drawable" name="screen_background_dark_transparent" />
   <public type="drawable" name="screen_background_light_transparent" />
+  <public type="drawable" name="stat_notify_sdcard_prepare" />
 </resources>

services/java/com/android/server/MountService.java

@@ -313,7 +313,7 @@ class MountService extends IMountService.Stub {
             setMediaStorageNotification(
                     com.android.internal.R.string.ext_media_safe_unmount_notification_title,
                     com.android.internal.R.string.ext_media_safe_unmount_notification_message,
-                    com.android.internal.R.drawable.stat_notify_sim_toolkit,
+                    com.android.internal.R.drawable.stat_notify_sdcard,
                     true, true, null);
             mShowSafeUnmountNotificationWhenUnmounted = false;
         } else {
@@ -333,7 +333,7 @@ class MountService extends IMountService.Stub {
         setMediaStorageNotification(
                 com.android.internal.R.string.ext_media_checking_notification_title,
                 com.android.internal.R.string.ext_media_checking_notification_message,
-                com.android.internal.R.drawable.stat_notify_sim_toolkit,
+                com.android.internal.R.drawable.stat_notify_sdcard_prepare,
                 true, false, null);
 
         updateUsbMassStorageNotification(true, false);