Merge "Running services: Hide actionbar buttons in overflow menu"

This commit is contained in:
TreeHugger Robot
2018-01-08 22:40:21 +00:00
committed by Android (Google) Code Review

View File

@@ -42,8 +42,6 @@ public class RunningServices extends SettingsPreferenceFragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
getActivity().setTitle(R.string.runningservices_settings_title); getActivity().setTitle(R.string.runningservices_settings_title);
} }
@@ -64,9 +62,9 @@ public class RunningServices extends SettingsPreferenceFragment {
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
mOptionsMenu = menu; mOptionsMenu = menu;
menu.add(0, SHOW_RUNNING_SERVICES, 1, R.string.show_running_services) menu.add(0, SHOW_RUNNING_SERVICES, 1, R.string.show_running_services)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
menu.add(0, SHOW_BACKGROUND_PROCESSES, 2, R.string.show_background_processes) menu.add(0, SHOW_BACKGROUND_PROCESSES, 2, R.string.show_background_processes)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
updateOptionsMenu(); updateOptionsMenu();
} }