Merge pull request #38 from arduino/feature/remove-nav-settings-entry

Remove settings button from the NavigationView

Author: Splact

OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java

@@ -447,8 +447,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
             safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link))));
         } else if (itemId == R.id.navigation_item_get_help) {
             safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link))));
-        } else if (itemId == R.id.navigation_item_settings) {
-            startActivity(new Intent(this, ArduinoSettingsActivity.class));
         } else {
             drawerLayout.closeDrawers();
             // Launch intents
@@ -632,7 +630,6 @@ private void onAccountSwitched(AppAccount appAccount) {
             final Menu menu = navigationView.getMenu();
             menu.findItem(R.id.navigation_item_get_science_kit).setVisible(true);
             menu.findItem(R.id.navigation_item_get_help).setVisible(true);
-            menu.findItem(R.id.navigation_item_settings).setVisible(false);
         } else {
             final String avatar = appAccount.getAccountAvatar();
             if (StringUtils.isEmpty(avatar)) {
@@ -667,7 +664,6 @@ private void onAccountSwitched(AppAccount appAccount) {
             final Menu menu = navigationView.getMenu();
             menu.findItem(R.id.navigation_item_get_science_kit).setVisible(!appAccount.isMinor());
             menu.findItem(R.id.navigation_item_get_help).setVisible(!appAccount.isMinor());
-            menu.findItem(R.id.navigation_item_settings).setVisible(true);
         }
 
         // Clean up old files from previous exports.

OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png

@@ -44,11 +44,6 @@
             android:icon="@drawable/ic_notes_white_24dp"
             android:title="@string/navigation_item_testing_options"
             android:visibility="gone" />
-        <item
-            android:id="@+id/navigation_item_settings"
-            android:icon="@drawable/ic_navigation_settings"
-            android:title="@string/navigation_item_settings"
-            android:visible="false" />
         <item
             android:id="@+id/navigation_item_about"
             android:icon="@drawable/ic_info_black_24dp"