diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-10-11 19:13:33 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-11 19:13:33 -0700 |
commit | ffbc4b948d0214c28df382f9eb209ea8f5ceef83 (patch) | |
tree | 3681db17c432008369ae3c22a11c949b5bef8c7e /packages | |
parent | de846ac659e8c14d898a3fa14bd0504b24096057 (diff) | |
parent | d39d515b9110d7405d0f03dbf612ba5c9b8ac566 (diff) | |
download | frameworks_base-ffbc4b948d0214c28df382f9eb209ea8f5ceef83.zip frameworks_base-ffbc4b948d0214c28df382f9eb209ea8f5ceef83.tar.gz frameworks_base-ffbc4b948d0214c28df382f9eb209ea8f5ceef83.tar.bz2 |
Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java | 30 |
2 files changed, 14 insertions, 20 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 0fccbe7..7995869 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -20,6 +20,10 @@ <activity android:name=".usb.UsbStorageActivity" android:excludeFromRecents="true"> </activity> + <activity android:name="com.android.internal.app.ExternalMediaFormatActivity" + android:theme="@*android:style/Theme.Dialog.Alert" + android:excludeFromRecents="true"> + </activity> </application> </manifest> diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java index b9e915a4..47ed7da 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java +++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java @@ -16,33 +16,17 @@ package com.android.systemui.usb; -import android.app.Activity; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.content.res.Resources; -import android.os.Bundle; import android.os.Environment; -import android.os.Handler; -import android.os.storage.IMountService; -import android.os.Message; -import android.os.ServiceManager; import android.os.storage.StorageEventListener; import android.os.storage.StorageManager; -import android.os.storage.StorageResultCode; import android.provider.Settings; import android.util.Slog; -import android.view.View; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; -import android.widget.Toast; public class StorageNotification extends StorageEventListener { private static final String TAG = "StorageNotification"; @@ -165,10 +149,16 @@ public class StorageNotification extends StorageEventListener { * Show safe to unmount media notification, and enable UMS * notification if connected. */ - 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_sdcard, true, true, null); + if (Environment.isExternalStorageRemovable()) { + 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_sdcard, true, true, null); + } else { + // This device does not have removable storage, so + // don't tell the user they can remove it. + setMediaStorageNotification(0, 0, 0, false, false, null); + } updateUsbMassStorageNotification(mUmsAvailable); } } else { |