Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread

Browse Source 
Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp

* commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
  Fix SD card mounting issues #3074555 and #3072332
This commit is contained in:
Dianne Hackborn
2010-10-11 19:17:05 -07:00
committed by Android Git Automerger
parent c30414329c ffbc4b948d
commit a007ab294d
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/AndroidManifest.xml
View File

@@ -1332,10 +1332,6 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="com.android.internal.app.ExternalMediaFormatActivity"
android:theme="@style/Theme.Dialog.Alert"
android:excludeFromRecents="true">
</activity>
<activity android:name="android.accounts.ChooseAccountActivity" <activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true" android:excludeFromRecents="true"

4
packages/SystemUI/AndroidManifest.xml
View File

@@ -20,6 +20,10 @@
<activity android:name=".usb.UsbStorageActivity" <activity android:name=".usb.UsbStorageActivity"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
<activity android:name="com.android.internal.app.ExternalMediaFormatActivity"
android:theme="@*android:style/Theme.Dialog.Alert"
android:excludeFromRecents="true">
</activity>
</application> </application>
</manifest> </manifest>

30
packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
View File

@@ -16,33 +16,17 @@
package com.android.systemui.usb; package com.android.systemui.usb;
import android.app.Activity;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle;
import android.os.Environment; 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.StorageEventListener;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.os.storage.StorageResultCode;
import android.provider.Settings; import android.provider.Settings;
import android.util.Slog; 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 { public class StorageNotification extends StorageEventListener {
private static final String TAG = "StorageNotification"; private static final String TAG = "StorageNotification";
@@ -165,10 +149,16 @@ public class StorageNotification extends StorageEventListener {
* Show safe to unmount media notification, and enable UMS * Show safe to unmount media notification, and enable UMS
* notification if connected. * notification if connected.
*/ */
setMediaStorageNotification( if (Environment.isExternalStorageRemovable()) {
com.android.internal.R.string.ext_media_safe_unmount_notification_title, setMediaStorageNotification(
com.android.internal.R.string.ext_media_safe_unmount_notification_message, com.android.internal.R.string.ext_media_safe_unmount_notification_title,
com.android.internal.R.drawable.stat_notify_sdcard, true, true, null); 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); updateUsbMassStorageNotification(mUmsAvailable);
} }
} else { } else {