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

Commit 97a8db3c authored by Rachel Zhang's avatar Rachel Zhang Committed by Android (Google) Code Review
Browse files

Merge "Remove settings overflow menu" into nyc-mr1-dev

parents e86eae85 471815e4

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -5537,8 +5537,6 @@ 








    <!-- Help URI, Default [DO NOT TRANSLATE] -->









    <string name="help_uri_default" translatable="false"></string>









    <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->









    <string name="help_uri_dashboard" translatable="false"></string>









    <!-- Help URI, Android beam [DO NOT TRANSLATE] -->









    <string name="help_uri_beam" translatable="false"></string>









    <!-- Help URI, Display [DO NOT TRANSLATE] -->
































src/com/android/settings/dashboard/DashboardContainerFragment.java



+0
−8






























Original line number
Diff line number
Diff line







@@ -82,14 +82,6 @@ public final class DashboardContainerFragment extends InstrumentedFragment {







        }









    }



















    @Override









    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {









        super.onCreateOptionsMenu(menu, inflater);









        if (getActivity() == null) return;









        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_dashboard,









                getClass().getName());









    }



















    private static final class DashboardViewPagerAdapter extends FragmentPagerAdapter {



















        private final Context mContext;