commit 17bf5a992b66d9f1b57f11a5ccd698f90f68262f
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 21 00:48:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 21 00:48:13 2018 +0000
tree 8c5cd09112baf863b98e7f7ef9d304685779177c
parent 140c11e6661a6c953441c14dc8df784956baf32c
parent fff36c79e3ed40bd56443bddb81fa2144efe95a9

Merge changes from topic "am-f7daa49c-d3a5-4fd5-9a61-523ac89272b4" into ub-launcher3-master

* changes:
  [automerger] Fixing preference highlight when opening notification access am: d47f2d26cc
  Fixing preference highlight when opening notification access

src/com/android/launcher3/SettingsActivity.java

diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java
index 7bd6557..32c198a 100644
--- a/src/com/android/launcher3/SettingsActivity.java
+++ b/src/com/android/launcher3/SettingsActivity.java
@@ -62,6 +62,7 @@
     private static final String NOTIFICATION_ENABLED_LISTENERS = "enabled_notification_listeners";
 
     private static final String EXTRA_FRAGMENT_ARG_KEY = ":settings:fragment_args_key";
+    private static final String EXTRA_SHOW_FRAGMENT_ARGS = ":settings:show_fragment_args";
     private static final int DELAY_HIGHLIGHT_DURATION_MILLIS = 600;
     private static final String SAVE_HIGHLIGHTED_KEY = "android:preference_highlighted";
 
@@ -286,9 +287,13 @@
         @Override
         public void onClick(DialogInterface dialogInterface, int i) {
             ComponentName cn = new ComponentName(getActivity(), NotificationListener.class);
+            Bundle showFragmentArgs = new Bundle();
+            showFragmentArgs.putString(EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString());
+
             Intent intent = new Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    .putExtra(":settings:fragment_args_key", cn.flattenToString());
+                    .putExtra(EXTRA_FRAGMENT_ARG_KEY, cn.flattenToString())
+                    .putExtra(EXTRA_SHOW_FRAGMENT_ARGS, showFragmentArgs);
             getActivity().startActivity(intent);
         }
     }