commit c400359fe1aa20fad77215403aeadeb84816b64e
author Michael Chan Wed Mar 25 15:16:51 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Mar 25 15:16:51 2009 -0700
tree 83b62aa988e29fb81937860028598c9803d695df
parent 9e378d4ceed04055546b0a6adc93eac42be3c9e8

Automated import from //branches/donutburger/...@142626,142626

res/layout/edit_event.xml

diff --git a/res/layout/edit_event.xml b/res/layout/edit_event.xml
index eb5886e..352a4ed 100644
--- a/res/layout/edit_event.xml
+++ b/res/layout/edit_event.xml
@@ -289,11 +289,18 @@
             android:layout_height="wrap_content"
             android:gravity="center_vertical|right"
             android:paddingBottom="5dip">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="2dip"
+                android:text="@string/add_new_reminder"/>
+
             <ImageButton android:id="@+id/reminder_add"
                 style="@style/PlusButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dip"
+                android:layout_marginRight="7dip"
                 android:gravity="center_vertical|right"
             />
         </LinearLayout>

res/layout/edit_reminder_item.xml

diff --git a/res/layout/edit_reminder_item.xml b/res/layout/edit_reminder_item.xml
index 18e45e6..2857255 100644
--- a/res/layout/edit_reminder_item.xml
+++ b/res/layout/edit_reminder_item.xml
@@ -25,13 +25,13 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:layout_gravity="center_vertical"
+        android:layout_marginRight="2dip"
         android:entries="@array/reminder_minutes_labels"/>
 
     <ImageButton android:id="@+id/reminder_remove"
         style="@style/MinusButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="2dip"
         android:gravity="center_vertical"
     />
 </LinearLayout>

res/layout/event_info_activity.xml

diff --git a/res/layout/event_info_activity.xml b/res/layout/event_info_activity.xml
index 3a85ac9..3992e80 100644
--- a/res/layout/event_info_activity.xml
+++ b/res/layout/event_info_activity.xml
@@ -185,7 +185,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="8dip"
-            android:paddingRight="8dip"
+            android:paddingRight="7dip"
             android:paddingTop="5dip"
             android:paddingBottom="1dip">
         
@@ -205,13 +205,21 @@
         <LinearLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:gravity="right"
+            android:gravity="center_vertical|right"
+            android:paddingRight="5dip"
             android:paddingBottom="5dip">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="7dip"
+                android:text="@string/add_new_reminder"/>
+
             <ImageButton android:id="@+id/reminder_add"
                 style="@style/PlusButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dip"
+                android:layout_marginRight="2dip"
             />
         </LinearLayout>
     </LinearLayout>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0e26905..e49015e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -247,9 +247,9 @@
     <!-- A menu item for deleting an event -->
     <string name="delete_event_label">"Delete event"</string>
     <!-- The button label for saving an event -->
-    <string name="save_label">Save</string>
+    <string name="save_label">Done</string>
     <!-- The button label for discarding changes to an event -->
-    <string name="discard_label">Discard changes</string>
+    <string name="discard_label">Revert</string>
     <!-- The button label for importing events from another source to the phone -->
     <string name="import_label">"Import"</string>