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

am: 97a8db3c8a

* commit '97a8db3c8af60ffa381347963a0ccaf700a71ee7':
  Remove settings overflow menu

Change-Id: I081b2dab824053294749995deb41147c8620a57a
This commit is contained in:
Rachel Zhang
2016-05-17 16:56:20 +00:00
committed by android-build-merger
2 changed files with 0 additions and 10 deletions

View File

@@ -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] -->

View File

@@ -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;