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

Merge "Make sure to go to the right Settings panel when tapping a notification"

Browse Source
This commit is contained in:
Christopher Tate
2011-08-24 14:12:18 -07:00
committed by Android (Google) Code Review
parent c7015c7450 765f97d5e6
commit 1c424f86c6
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -568,12 +568,9 @@ public class UsbDeviceManager {
notification.sound = null; notification.sound = null;
notification.vibrate = null; notification.vibrate = null;
Intent intent = new Intent( Intent intent = Intent.makeRestartActivityTask(
Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS); new ComponentName("com.android.settings",
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | "com.android.settings.UsbSettings"));
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
intent.setComponent(new ComponentName("com.android.settings",
"com.android.settings.UsbSettings"));
PendingIntent pi = PendingIntent.getActivity(mContext, 0, PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0); intent, 0);
notification.setLatestEventInfo(mContext, title, message, pi); notification.setLatestEventInfo(mContext, title, message, pi);
@@ -604,12 +601,9 @@ public class UsbDeviceManager {
notification.sound = null; notification.sound = null;
notification.vibrate = null; notification.vibrate = null;
Intent intent = new Intent( Intent intent = Intent.makeRestartActivityTask(
Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS); new ComponentName("com.android.settings",
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | "com.android.settings.DevelopmentSettings"));
Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
intent.setComponent(new ComponentName("com.android.settings",
"com.android.settings.DevelopmentSettings"));
PendingIntent pi = PendingIntent.getActivity(mContext, 0, PendingIntent pi = PendingIntent.getActivity(mContext, 0,
intent, 0); intent, 0);
notification.setLatestEventInfo(mContext, title, message, pi); notification.setLatestEventInfo(mContext, title, message, pi);