commit 699efba10667eb18bd28de02aebb549257baf53e
author Daniel Nishi <dhnishi@google.com> Tue May 17 18:10:51 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 18:10:53 2016 +0000
tree 92a5cd74652d591626e8d094717c96dae969108c
parent 97a8db3c8af60ffa381347963a0ccaf700a71ee7
parent 116a55cdabccb86e0c9a2548eebeb72b7d7d387e

Merge "Add the automatic storage manager settings." into nyc-mr1-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index be82934..07f36e1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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

diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java
index b75cef2..31712d2 100644
--- a/src/com/android/settings/dashboard/DashboardContainerFragment.java
+++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java
@@ -82,14 +82,6 @@
         }
     }
 
-    @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;