commit 1a0d0ccfd982a8fbd0f753cdb0e52e57feffaa7a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jan 08 22:40:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 08 22:40:21 2018 +0000
tree 668adb71a96740eb6220832e8f30899f3d86e7a9
parent 176ce91de9430b12ac289827cafe291407fd4248
parent 5da84c7de0cf5de766e5306c20adcadd0c033875

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

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

diff --git a/src/com/android/settings/applications/RunningServices.java b/src/com/android/settings/applications/RunningServices.java
index 4e3d629..bf48492 100644
--- a/src/com/android/settings/applications/RunningServices.java
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -42,8 +42,6 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setHasOptionsMenu(true);
-
         getActivity().setTitle(R.string.runningservices_settings_title);
     }
 
@@ -64,9 +62,9 @@
     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();
     }