Better display event menu

diff --git a/res/menu/event.xml b/res/menu/event.xml
index 9b40a38db10138e5e3492e1b4338f9eb483870f9..abef50d2dd85af9f43b5b0e61c7dfb01c5dd6384 100644 (file)
--- a/res/menu/event.xml
+++ b/res/menu/event.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item android:id="@+id/deleteevent"
-          android:icon="@android:drawable/ic_menu_delete"
-          android:title="Delete Event"
-          android:titleCondensed="DELETE"
-          android:showAsAction="always">
+  <item android:id="@+id/edit_event"
+               android:icon="@android:drawable/ic_menu_edit"
+               android:title="@string/edit_event"
+        android:showAsAction="ifRoom">
+  </item>

 
 

-    </item>
+  <item android:id="@+id/deleteevent"
+        android:icon="@android:drawable/ic_menu_delete"
+        android:title="@string/delete_event"
+        android:showAsAction="ifRoom">
+  </item>

 
 

-    <item android:id="@+id/edit_event"
-          android:title="@string/edit_event"
-          android:showAsAction="ifRoom">
-    </item>
-
-    <item android:id="@+id/eventlist"
-          android:title="@string/eventlist"
-          android:showAsAction="ifRoom">
-    </item>
-
-       <item android:id="@+id/add_alarm"
-                 android:title="@string/add_alarm"
-                 android:icon="@android:drawable/ic_menu_add"
-                 android:showAsAction="ifRoom">
-       </item>
+  <item android:id="@+id/add_alarm"
+               android:title="@string/add_alarm"
+               android:icon="@android:drawable/ic_menu_add"
+               android:showAsAction="ifRoom">
+  </item>

 </menu>
 </menu>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index edc277073b0de2fcf458d54230ce498f2ba909ea..c491c2c81a7f1034cd0c39d786c21d65c96a0fa0 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -46,10 +46,11 @@
     <string name="years">years</string>
     <string name="refresh">Refresh</string>
     <string name="stop_alarm">Stop Alarm</string>
     <string name="years">years</string>
     <string name="refresh">Refresh</string>
     <string name="stop_alarm">Stop Alarm</string>

-    <string name="edit_event">Edit Event</string>
+    <string name="edit_event">Edit event</string>

        <string name="add_alarm">Add alarm</string>
        <string name="delete">Delete</string>
        <string name="alarms">Alarms</string>
        <string name="add_alarm">Add alarm</string>
        <string name="delete">Delete</string>
        <string name="alarms">Alarms</string>

+       <string name="delete_event">Delete event</string>

 
     <string-array name="repeat_array_s">
         <item>Day</item>
 
     <string-array name="repeat_array_s">
         <item>Day</item>

diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 18f6ef9556b16ec1caabd0fff78d4abcec40ffd6..31e0626f907b16ca709431ace770f82dca1bdc54 100644 (file)
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -112,10 +112,6 @@ public class DisplayEventActivity extends Activity {
             d.setArguments(b);
                        d.show(getFragmentManager(), "Delete");
 
             d.setArguments(b);
                        d.show(getFragmentManager(), "Delete");
 

-                       return true;
-               case R.id.eventlist:
-                       final Intent it=new Intent(this, EventListActivity.class);
-                       startActivity(it);

                        return true;
                case R.id.edit_event:
                        AddEventActivity.editEvent(this, event);
                        return true;
                case R.id.edit_event:
                        AddEventActivity.editEvent(this, event);