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

Commit 81aa9508 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Bug 5078738: some options moved to overflow menu"

parents 78545348 348b62e6

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

+2 −2
Original line number Diff line number Diff line
@@ -712,10 +712,10 @@ public class ManageApplications extends Fragment implements 
        // bar UI to be very confusing.

        menu.add(0, SORT_ORDER_ALPHA, 1, R.string.sort_order_alpha)

                //.setIcon(android.R.drawable.ic_menu_sort_alphabetically)

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)

                //.setIcon(android.R.drawable.ic_menu_sort_by_size)

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        menu.add(0, SHOW_RUNNING_SERVICES, 3, R.string.show_running_services)

                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

        menu.add(0, SHOW_BACKGROUND_PROCESSES, 3, R.string.show_background_processes)

src/com/android/settings/wifi/WifiSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public class WifiSettings extends SettingsPreferenceFragment 
                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

            menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)

                    //.setIcon(android.R.drawable.ic_menu_manage)

                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        }

        super.onCreateOptionsMenu(menu, inflater);

    }