Removed the unnecessary Quit menu item

jwood · Dec 6, 2010 · de4412f · de4412f
1 parent db46834
commit de4412f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 22 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ Standup Timer is free, open source, and available under the Apache V2 license.
 
 ### Version 1.3
 - Allow a meeting with only 1 participant
+- Removed unnecessary Quit menu item
 
 ### Version 1.2
 - Added support for meetings of any length

diff --git a/...dup-timer-test/src/net/johnpwood/android/standuptimer/test/ConfigureStandupTimerTest.java b/...dup-timer-test/src/net/johnpwood/android/standuptimer/test/ConfigureStandupTimerTest.java
@@ -204,19 +204,4 @@ public void test_team_configuration_displayed_successfully() {
         assertTrue(a.displayTeamConfigurationCalled());
         EasyMock.verify(menuItem);
     }
-
-    @MediumTest
-    public void test_quit_menu_item_quits_the_application() {
-        MenuItem menuItem = EasyMock.createMock(MenuItem.class);
-        EasyMock.expect(menuItem.getItemId()).andReturn(R.id.quit);
-
-        EasyMock.replay(menuItem);
-        a.onOptionsItemSelected(menuItem);
-        assertFalse(a.displayAboutBoxCalled());
-        assertFalse(a.displayHelpDialogCalled());
-        assertFalse(a.displaySettingsCalled());
-        assertTrue(isFinishCalled());
-        assertFalse(a.displayTeamConfigurationCalled());
-        EasyMock.verify(menuItem);
-    }
 }
diff --git a/standup-timer/res/menu/menu.xml b/standup-timer/res/menu/menu.xml
@@ -8,6 +8,4 @@
       android:icon="@android:drawable/ic_menu_info_details" android:alphabeticShortcut="a" />
    <item android:id="@+id/help" android:title="@string/help_label"
       android:icon="@android:drawable/ic_menu_help" android:alphabeticShortcut="h" />
-   <item android:id="@+id/quit" android:title="@string/quit"
-      android:icon="@android:drawable/ic_menu_close_clear_cancel" android:alphabeticShortcut="q" />
 </menu>
diff --git a/standup-timer/res/values/strings.xml b/standup-timer/res/values/strings.xml
@@ -7,7 +7,6 @@
    <string name="length_of_meeting">Length of meeting</string>
    <string name="team">Team</string>
    <string name="start">Start</string>
-   <string name="quit">Quit</string>
 
    <string name="five_min">5 min</string>
    <string name="ten_min">10 min</string>

diff --git a/standup-timer/src/net/johnpwood/android/standuptimer/ConfigureStandupTimer.java b/standup-timer/src/net/johnpwood/android/standuptimer/ConfigureStandupTimer.java
@@ -77,10 +77,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             Logger.d("Displaying the team configuration");
             displayTeamConfiguration();
             return true;
-        case R.id.quit:
-            Logger.d("Quitting");
-            finish();
-            return true;
         default:
             Logger.e("Unknown menu item selected");
             return false;