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

Commit 1a0d0ccf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 176ce91d 5da84c7d

src/com/android/settings/applications/RunningServices.java

+2 −4
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ public class RunningServices extends SettingsPreferenceFragment { 
    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        setHasOptionsMenu(true);



        getActivity().setTitle(R.string.runningservices_settings_title);

    }
@@ -64,9 +62,9 @@ public class RunningServices extends SettingsPreferenceFragment { 
    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        mOptionsMenu = menu;

        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)

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        updateOptionsMenu();

    }