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

Merge "USB: Update strings for USB connected notifications"

Browse Source
This commit is contained in:
Mike Lockwood
2011-07-01 12:00:20 -07:00
committed by Android (Google) Code Review
parent d307878ebc d8404d2fdd
commit 54965341b1
2 changed files with 119 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/values/strings.xml
View File

@@ -2625,10 +2625,14 @@
<!-- USB_STORAGE_ERROR dialog ok button-->
<string name="dlg_ok">OK</string>
<!-- USB_PREFERENCES: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across. This is the title -->
<string name="usb_preferences_notification_title">USB connected</string>
<!-- USB_PREFERENCES: Notification for wehen the user connects the phone to a computer via USB in MTP mode. This is the title -->
<string name="usb_mtp_notification_title">Connected as a media device</string>
<!-- USB_PREFERENCES: Notification for wehen the user connects the phone to a computer via USB in PTP mode. This is the title -->
<string name="usb_ptp_notification_title">Connected as a camera</string>
<!-- USB_PREFERENCES: Notification for wehen the user connects the phone to a computer via USB in mass storage mode (for installer CD image). This is the title -->
<string name="usb_cd_installer_notification_title">Connected as an installer</string>
<!-- See USB_PREFERENCES. This is the message. -->
<string name="usb_preferece_notification_message">Select to configure USB file transfer.</string>
<string name="usb_notification_message">Touch for other USB options</string>
<!-- External media format dialog strings -->
<!-- This is the label for the activity, and should never be visible to the user. -->

219
services/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -93,18 +93,9 @@ public class UsbDeviceManager {
private final UsbSettingsManager mSettingsManager;
private NotificationManager mNotificationManager;
private final boolean mHasUsbAccessory;
// for USB connected notification
private boolean mUsbNotificationShown;
private boolean mUseUsbNotification;
private Notification mUsbNotification;
// for adb connected notification
private boolean mAdbNotificationShown;
private Notification mAdbNotification;
private boolean mAdbEnabled;
private class AdbSettingsObserver extends ContentObserver {
public AdbSettingsObserver() {
super(null);
@@ -117,99 +108,6 @@ public class UsbDeviceManager {
}
}
private void updateUsbNotification(boolean connected) {
if (mNotificationManager == null || !mUseUsbNotification) return;
if (connected) {
if (!mUsbNotificationShown) {
Resources r = mContext.getResources();
CharSequence title = r.getText(
com.android.internal.R.string.usb_preferences_notification_title);
CharSequence message = r.getText(
com.android.internal.R.string.usb_preferece_notification_message);
if (mUsbNotification == null) {
mUsbNotification = new Notification();
mUsbNotification.icon = com.android.internal.R.drawable.stat_sys_data_usb;
mUsbNotification.when = 0;
mUsbNotification.flags = Notification.FLAG_ONGOING_EVENT;
mUsbNotification.tickerText = title;
mUsbNotification.defaults = 0; // please be quiet
mUsbNotification.sound = null;
mUsbNotification.vibrate = null;
}
Intent intent = new Intent();
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
intent.setClassName("com.android.systemui",
"com.android.systemui.usb.UsbPreferenceActivity");
PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0);
mUsbNotification.setLatestEventInfo(mContext, title, message, pi);
mUsbNotificationShown = true;
mNotificationManager.notify(
com.android.internal.R.string.usb_preferences_notification_title,
mUsbNotification);
}
} else if (mUsbNotificationShown) {
mUsbNotificationShown = false;
mNotificationManager.cancel(
com.android.internal.R.string.usb_preferences_notification_title);
}
}
private void updateAdbNotification(boolean adbEnabled) {
if (mNotificationManager == null) return;
if (adbEnabled) {
if ("0".equals(SystemProperties.get("persist.adb.notify"))) return;
if (!mAdbNotificationShown) {
Resources r = mContext.getResources();
CharSequence title = r.getText(
com.android.internal.R.string.adb_active_notification_title);
CharSequence message = r.getText(
com.android.internal.R.string.adb_active_notification_message);
if (mAdbNotification == null) {
mAdbNotification = new Notification();
mAdbNotification.icon = com.android.internal.R.drawable.stat_sys_adb;
mAdbNotification.when = 0;
mAdbNotification.flags = Notification.FLAG_ONGOING_EVENT;
mAdbNotification.tickerText = title;
mAdbNotification.defaults = 0; // please be quiet
mAdbNotification.sound = null;
mAdbNotification.vibrate = null;
}
Intent intent = new Intent(
Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
// Note: we are hard-coding the component because this is
// an important security UI that we don't want anyone
// intercepting.
intent.setComponent(new ComponentName("com.android.settings",
"com.android.settings.DevelopmentSettings"));
PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0);
mAdbNotification.setLatestEventInfo(mContext, title, message, pi);
mAdbNotificationShown = true;
mNotificationManager.notify(
com.android.internal.R.string.adb_active_notification_title,
mAdbNotification);
}
} else if (mAdbNotificationShown) {
mAdbNotificationShown = false;
mNotificationManager.cancel(
com.android.internal.R.string.adb_active_notification_title);
}
}
/*
* Listens for uevent messages from the kernel to monitor the USB state
*/
@@ -319,6 +217,14 @@ public class UsbDeviceManager {
private String mDefaultFunctions;
private UsbAccessory mCurrentAccessory;
private boolean mDeferAccessoryAttached;
private int mUsbNotificationId;
private boolean mAdbNotificationShown;
private static final int NOTIFICATION_NONE = 0;
private static final int NOTIFICATION_MTP = 1;
private static final int NOTIFICATION_PTP = 2;
private static final int NOTIFICATION_INSTALLER = 3;
private static final int NOTIFICATION_ADB = 4;
public UsbHandler() {
// Read initial USB state
@@ -449,7 +355,7 @@ public class UsbDeviceManager {
functions = removeFunction(mDefaultFunctions, UsbManager.USB_FUNCTION_ADB);
}
setCurrentFunction(functions, true);
updateAdbNotification(mAdbEnabled && mConnected);
updateAdbNotification();
}
}
@@ -517,8 +423,8 @@ public class UsbDeviceManager {
case MSG_UPDATE_STATE:
mConnected = (msg.arg1 == 1);
mConfigured = (msg.arg2 == 1);
updateUsbNotification(mConnected);
updateAdbNotification(mAdbEnabled && mConnected);
updateUsbNotification();
updateAdbNotification();
if (containsFunction(mCurrentFunctions,
UsbManager.USB_FUNCTION_ACCESSORY)) {
updateCurrentAccessory();
@@ -562,8 +468,8 @@ public class UsbDeviceManager {
}
break;
case MSG_SYSTEM_READY:
updateUsbNotification(mConnected);
updateAdbNotification(mAdbEnabled && mConnected);
updateUsbNotification();
updateAdbNotification();
updateUsbState();
if (mCurrentAccessory != null && mDeferAccessoryAttached) {
mSettingsManager.accessoryAttached(mCurrentAccessory);
@@ -576,6 +482,105 @@ public class UsbDeviceManager {
return mCurrentAccessory;
}
private void updateUsbNotification() {
if (mNotificationManager == null || !mUseUsbNotification) return;
if (mConnected) {
Resources r = mContext.getResources();
CharSequence title = null;
int id = NOTIFICATION_NONE;
if (containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_MTP)) {
title = r.getText(
com.android.internal.R.string.usb_mtp_notification_title);
id = NOTIFICATION_MTP;
} else if (containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_PTP)) {
title = r.getText(
com.android.internal.R.string.usb_ptp_notification_title);
id = NOTIFICATION_PTP;
} else if (containsFunction(mCurrentFunctions,
UsbManager.USB_FUNCTION_MASS_STORAGE)) {
title = r.getText(
com.android.internal.R.string.usb_cd_installer_notification_title);
id = NOTIFICATION_INSTALLER;
} else {
Log.e(TAG, "No known USB function in updateUsbNotification");
}
if (id != mUsbNotificationId) {
// clear notification if title needs changing
if (mUsbNotificationId != NOTIFICATION_NONE) {
mNotificationManager.cancel(mUsbNotificationId);
mUsbNotificationId = NOTIFICATION_NONE;
}
}
if (mUsbNotificationId == NOTIFICATION_NONE) {
CharSequence message = r.getText(
com.android.internal.R.string.usb_notification_message);
Notification notification = new Notification();
notification.icon = com.android.internal.R.drawable.stat_sys_data_usb;
notification.when = 0;
notification.flags = Notification.FLAG_ONGOING_EVENT;
notification.tickerText = title;
notification.defaults = 0; // please be quiet
notification.sound = null;
notification.vibrate = null;
Intent intent = new Intent();
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
intent.setClassName("com.android.systemui",
"com.android.systemui.usb.UsbPreferenceActivity");
PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0);
notification.setLatestEventInfo(mContext, title, message, pi);
mNotificationManager.notify(id, notification);
mUsbNotificationId = id;
}
} else if (mUsbNotificationId != NOTIFICATION_NONE) {
mNotificationManager.cancel(mUsbNotificationId);
mUsbNotificationId = NOTIFICATION_NONE;
}
}
private void updateAdbNotification() {
if (mNotificationManager == null) return;
if (mAdbEnabled && mConnected) {
if ("0".equals(SystemProperties.get("persist.adb.notify"))) return;
if (!mAdbNotificationShown) {
Resources r = mContext.getResources();
CharSequence title = r.getText(
com.android.internal.R.string.adb_active_notification_title);
CharSequence message = r.getText(
com.android.internal.R.string.adb_active_notification_message);
Notification notification = new Notification();
notification.icon = com.android.internal.R.drawable.stat_sys_adb;
notification.when = 0;
notification.flags = Notification.FLAG_ONGOING_EVENT;
notification.tickerText = title;
notification.defaults = 0; // please be quiet
notification.sound = null;
notification.vibrate = null;
Intent intent = new Intent(
Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
intent.setComponent(new ComponentName("com.android.settings",
"com.android.settings.DevelopmentSettings"));
PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0);
notification.setLatestEventInfo(mContext, title, message, pi);
mAdbNotificationShown = true;
mNotificationManager.notify(NOTIFICATION_ADB, notification);
}
} else if (mAdbNotificationShown) {
mAdbNotificationShown = false;
mNotificationManager.cancel(NOTIFICATION_ADB);
}
}
public void dump(FileDescriptor fd, PrintWriter pw) {
pw.println(" USB Device State:");
pw.println(" Current Functions: " + mCurrentFunctions);