diff options
| -rw-r--r-- | res/menu-land/photo.xml | 11 | ||||
| -rw-r--r-- | res/menu/operation.xml | 8 | ||||
| -rw-r--r-- | res/menu/photo.xml | 8 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
4 files changed, 5 insertions, 25 deletions
diff --git a/res/menu-land/photo.xml b/res/menu-land/photo.xml index 023a93bed..21f802a25 100644 --- a/res/menu-land/photo.xml +++ b/res/menu-land/photo.xml @@ -30,16 +30,7 @@ android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" android:visible="false" - android:showAsAction="ifRoom"> - <menu> - <item android:id="@+id/action_confirm_delete" - android:icon="@drawable/ic_menu_trash_holo_light" - android:title="@string/confirm_delete" /> - <item android:id="@+id/action_cancel_delete" - android:icon="@drawable/ic_menu_cancel_holo_light" - android:title="@string/cancel" /> - </menu> - </item> + android:showAsAction="ifRoom" /> <item android:id="@+id/action_slideshow" android:icon="@drawable/ic_menu_slideshow_holo_light" android:title="@string/slideshow" diff --git a/res/menu/operation.xml b/res/menu/operation.xml index aa9b758c4..3225e1ec6 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -30,13 +30,7 @@ android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" android:visible="false" - android:showAsAction="ifRoom"> - <menu> - <item android:id="@+id/action_confirm_delete" - android:icon="@drawable/ic_menu_trash_holo_light" - android:title="@string/confirm_delete" /> - </menu> - </item> + android:showAsAction="ifRoom" /> <item android:id="@+id/action_edit" android:title="@string/edit" android:showAsAction="never" diff --git a/res/menu/photo.xml b/res/menu/photo.xml index d8e61e0fe..685627a4f 100644 --- a/res/menu/photo.xml +++ b/res/menu/photo.xml @@ -30,13 +30,7 @@ android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" android:visible="false" - android:showAsAction="never"> - <menu> - <item android:id="@+id/action_confirm_delete" - android:icon="@drawable/ic_menu_trash_holo_light" - android:title="@string/confirm_delete" /> - </menu> - </item> + android:showAsAction="never" /> <item android:id="@+id/action_slideshow" android:icon="@drawable/ic_menu_slideshow_holo_light" android:title="@string/slideshow" diff --git a/res/values/strings.xml b/res/values/strings.xml index b0a01eeb3..e8bf0f49a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -94,7 +94,8 @@ <!-- Details dialog "OK" button. Dismisses dialog. --> <string name="delete">Delete</string> - <string name="confirm_delete">Delete</string> + <string name="confirm_action">Confirm deletion?</string> + <string name="confirm">Confirm</string> <string name="cancel">Cancel</string> <string name="share">Share</string> |