diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java index 46ceb395..400e280b 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java +++ b/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. diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png deleted file mode 100644 index cca43a4e..00000000 Binary files a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png and /dev/null differ diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-mdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-mdpi/ic_navigation_settings.png deleted file mode 100644 index 7fe337f1..00000000 Binary files a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-mdpi/ic_navigation_settings.png and /dev/null differ diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xhdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xhdpi/ic_navigation_settings.png deleted file mode 100644 index 8e377f05..00000000 Binary files a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xhdpi/ic_navigation_settings.png and /dev/null differ diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xxhdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xxhdpi/ic_navigation_settings.png deleted file mode 100644 index 41ad8b59..00000000 Binary files a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xxhdpi/ic_navigation_settings.png and /dev/null differ diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml b/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml index 201c0a11..519ca442 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml +++ b/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml @@ -44,11 +44,6 @@ android:icon="@drawable/ic_notes_white_24dp" android:title="@string/navigation_item_testing_options" android:visibility="gone" /> -