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
This commit is contained in:
TreeHugger Robot
2018-04-21 00:48:13 +00:00
committed by Android (Google) Code Review

View File

@@ -62,6 +62,7 @@ public class SettingsActivity extends Activity {
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 @@ public class SettingsActivity extends Activity {
@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);
}
}