Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c424f86 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

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

parents c7015c74 765f97d5

services/java/com/android/server/usb/UsbDeviceManager.java

+6 −12
Original line number Diff line number Diff line
@@ -568,11 +568,8 @@ public class UsbDeviceManager { 
                    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",

                    Intent intent = Intent.makeRestartActivityTask(

                            new ComponentName("com.android.settings",

                                    "com.android.settings.UsbSettings"));

                    PendingIntent pi = PendingIntent.getActivity(mContext, 0,

                            intent, 0);
@@ -604,11 +601,8 @@ public class UsbDeviceManager { 
                    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",

                    Intent intent = Intent.makeRestartActivityTask(

                            new ComponentName("com.android.settings",

                                    "com.android.settings.DevelopmentSettings"));

                    PendingIntent pi = PendingIntent.getActivity(mContext, 0,

                            intent, 0);