diff options
41 files changed, 206 insertions, 192 deletions
diff --git a/res/drawable/ic_btn_actionmenu_attach_default.png b/res/drawable/ic_btn_actionmenu_attach_default.png Binary files differnew file mode 100644 index 0000000..78d6e1b --- /dev/null +++ b/res/drawable/ic_btn_actionmenu_attach_default.png diff --git a/res/drawable/ic_btn_actionmenu_attach_pressed.png b/res/drawable/ic_btn_actionmenu_attach_pressed.png Binary files differnew file mode 100644 index 0000000..01cbe46 --- /dev/null +++ b/res/drawable/ic_btn_actionmenu_attach_pressed.png diff --git a/res/drawable/ic_btn_actionmenu_attach_selected.png b/res/drawable/ic_btn_actionmenu_attach_selected.png Binary files differnew file mode 100644 index 0000000..ee7af0b --- /dev/null +++ b/res/drawable/ic_btn_actionmenu_attach_selected.png diff --git a/res/drawable/ic_btn_actionmenu_cancel_default.png b/res/drawable/ic_btn_actionmenu_cancel_default.png Binary files differnew file mode 100644 index 0000000..cb8f7bc --- /dev/null +++ b/res/drawable/ic_btn_actionmenu_cancel_default.png diff --git a/res/drawable/ic_btn_actionmenu_cancel_pressed.png b/res/drawable/ic_btn_actionmenu_cancel_pressed.png Binary files differnew file mode 100644 index 0000000..02bdb49 --- /dev/null +++ b/res/drawable/ic_btn_actionmenu_cancel_pressed.png diff --git a/res/drawable/ic_btn_actionmenu_cancel_selected.png b/res/drawable/ic_btn_actionmenu_cancel_selected.png Binary files differnew file mode 100644 index 0000000..a0b6017 --- /dev/null +++ b/res/drawable/ic_btn_actionmenu_cancel_selected.png diff --git a/res/drawable/ic_btn_actionmenu_capture_default.png b/res/drawable/ic_btn_actionmenu_capture_default.png Binary files differdeleted file mode 100644 index 2837405..0000000 --- a/res/drawable/ic_btn_actionmenu_capture_default.png +++ /dev/null diff --git a/res/drawable/ic_btn_actionmenu_capture_pressed.png b/res/drawable/ic_btn_actionmenu_capture_pressed.png Binary files differdeleted file mode 100644 index 617c366..0000000 --- a/res/drawable/ic_btn_actionmenu_capture_pressed.png +++ /dev/null diff --git a/res/drawable/ic_btn_actionmenu_capture_selected.png b/res/drawable/ic_btn_actionmenu_capture_selected.png Binary files differdeleted file mode 100644 index 81c0278..0000000 --- a/res/drawable/ic_btn_actionmenu_capture_selected.png +++ /dev/null diff --git a/res/drawable/ic_menu_capture.xml b/res/drawable/ic_btn_camera_background.xml index 9f3b16d..2e28a80 100644 --- a/res/drawable/ic_menu_capture.xml +++ b/res/drawable/ic_btn_camera_background.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* grid_background.xml -** +/* ** Copyright 2006, The Android Open Source Project ** ** Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +17,7 @@ */ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/ic_btn_actionmenu_capture_pressed" /> - <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/ic_btn_actionmenu_capture_selected" /> - <item android:drawable="@drawable/ic_btn_actionmenu_capture_default" /> + <item android:state_pressed="true" android:drawable="@drawable/ic_btn_camera_pressed_background" /> + <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/ic_btn_camera_selected_background" /> + <item android:drawable="@drawable/ic_btn_camera_default_background" /> </selector> diff --git a/res/drawable/ic_btn_camera_default_background.png b/res/drawable/ic_btn_camera_default_background.png Binary files differnew file mode 100644 index 0000000..68bdefd --- /dev/null +++ b/res/drawable/ic_btn_camera_default_background.png diff --git a/res/drawable/ic_btn_camera_pressed_background.png b/res/drawable/ic_btn_camera_pressed_background.png Binary files differnew file mode 100644 index 0000000..e5543e1 --- /dev/null +++ b/res/drawable/ic_btn_camera_pressed_background.png diff --git a/res/drawable/ic_btn_camera_selected_background.png b/res/drawable/ic_btn_camera_selected_background.png Binary files differnew file mode 100644 index 0000000..0d4ff1a --- /dev/null +++ b/res/drawable/ic_btn_camera_selected_background.png diff --git a/res/drawable/ic_camera_indicator_photo_combo.xml b/res/drawable/ic_camera_indicator_photo_combo.xml deleted file mode 100644 index c8b6503..0000000 --- a/res/drawable/ic_camera_indicator_photo_combo.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" - android:drawable="@drawable/ic_camera_indicator_photo_pressed" /> - <item android:state_window_focused="true" android:state_focused="true" - android:drawable="@drawable/ic_camera_indicator_photo_selected" /> - <item android:drawable="@drawable/ic_camera_indicator_photo" /> - -</selector> diff --git a/res/drawable/ic_camera_indicator_photo_pressed.png b/res/drawable/ic_camera_indicator_photo_pressed.png Binary files differdeleted file mode 100644 index cdd7a0a..0000000 --- a/res/drawable/ic_camera_indicator_photo_pressed.png +++ /dev/null diff --git a/res/drawable/ic_camera_indicator_photo_selected.png b/res/drawable/ic_camera_indicator_photo_selected.png Binary files differdeleted file mode 100644 index 670922d..0000000 --- a/res/drawable/ic_camera_indicator_photo_selected.png +++ /dev/null diff --git a/res/drawable/ic_camera_indicator_video_combo.xml b/res/drawable/ic_camera_indicator_video_combo.xml deleted file mode 100644 index c91d113..0000000 --- a/res/drawable/ic_camera_indicator_video_combo.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" - android:drawable="@drawable/ic_camera_indicator_video_pressed" /> - <item android:state_window_focused="true" android:state_focused="true" - android:drawable="@drawable/ic_camera_indicator_video_selected" /> - <item android:drawable="@drawable/ic_camera_indicator_video" /> - -</selector> diff --git a/res/drawable/ic_camera_indicator_video_pressed.png b/res/drawable/ic_camera_indicator_video_pressed.png Binary files differdeleted file mode 100644 index cfadd1d..0000000 --- a/res/drawable/ic_camera_indicator_video_pressed.png +++ /dev/null diff --git a/res/drawable/ic_camera_indicator_video_selected.png b/res/drawable/ic_camera_indicator_video_selected.png Binary files differdeleted file mode 100644 index 68a4f8e..0000000 --- a/res/drawable/ic_camera_indicator_video_selected.png +++ /dev/null diff --git a/res/drawable/ic_menu_attach.xml b/res/drawable/ic_menu_attach.xml new file mode 100644 index 0000000..209f6b5 --- /dev/null +++ b/res/drawable/ic_menu_attach.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_btn_actionmenu_attach_pressed" /> + <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/ic_btn_actionmenu_attach_selected" /> + <item android:drawable="@drawable/ic_btn_actionmenu_attach_default" /> +</selector> diff --git a/res/drawable/ic_menu_cancel.xml b/res/drawable/ic_menu_cancel.xml new file mode 100644 index 0000000..92960d9 --- /dev/null +++ b/res/drawable/ic_menu_cancel.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" android:drawable="@drawable/ic_btn_actionmenu_cancel_pressed" /> + <item android:state_window_focused="true" android:state_focused="true" android:drawable="@drawable/ic_btn_actionmenu_cancel_selected" /> + <item android:drawable="@drawable/ic_btn_actionmenu_cancel_default" /> +</selector> diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 60066ec..25b8039 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -20,45 +20,44 @@ android:orientation="horizontal"> <com.android.camera.VideoPreview - android:id="@+id/camera_preview" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_centerInParent="true" - /> + android:id="@+id/camera_preview" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_centerInParent="true" /> <ImageView - android:id="@+id/blackout" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:visibility="invisible" - /> - - <ImageView - android:id="@+id/focus_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_camera_indicator_auto_focus_green" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_marginRight="6dip" - android:layout_marginTop="6dip" - android:scaleType="center" - android:visibility="gone"/> + android:id="@+id/blackout" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:visibility="invisible" /> <ImageView android:id="@+id/mode_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_camera_indicator_photo_combo" + android:src="@drawable/ic_camera_indicator_photo" + android:background="@drawable/ic_btn_camera_background" android:clickable="true" android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="5dip" - android:layout_marginTop="15dip" - android:scaleType="center"/> + android:layout_marginRight="50dip" + android:layout_marginTop="10dip" + android:scaleType="center" /> - <ImageView + <ImageView + android:id="@+id/focus_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_camera_indicator_auto_focus_green" + android:layout_alignLeft="@id/mode_indicator" + android:layout_alignTop="@id/mode_indicator" + android:layout_marginLeft="39dip" + android:layout_marginTop="16dip" + android:scaleType="center" + android:visibility="gone" /> + + <ImageView android:id="@+id/last_picture_button" android:layout_width="75dip" android:layout_height="75dip" @@ -67,17 +66,17 @@ android:layout_alignParentLeft="true" android:layout_alignParentBottom="true" android:layout_marginLeft="10dip" - android:layout_marginBottom="10dip"/> + android:layout_marginBottom="10dip" /> <TextView - android:id="@+id/hint_toast" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:background="@drawable/popup_camera_toast" - android:layout_width="200dip" - android:layout_height="wrap_content" - android:gravity="center" - android:text="@string/camera_button_hint" - android:textSize="18sp"/> + android:id="@+id/hint_toast" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:background="@drawable/popup_camera_toast" + android:layout_width="200dip" + android:layout_height="wrap_content" + android:gravity="center" + android:text="@string/camera_button_hint" + android:textSize="18sp" /> </RelativeLayout> diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index 1c73b10..347305e 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -44,37 +44,42 @@ android:id="@+id/mode_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_camera_indicator_video_combo" + android:src="@drawable/ic_camera_indicator_video" + android:background="@drawable/ic_btn_camera_background" android:clickable="true" android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="5dip" - android:layout_marginTop="15dip" + android:layout_marginRight="50dip" + android:layout_marginTop="10dip" android:scaleType="center"/> <ImageView android:id="@+id/recording_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_camera_bar_indicator_record_combo" + android:src="@drawable/ic_camera_bar_indicator_record" + android:background="@drawable/ic_btn_camera_background" android:clickable="true" android:focusable="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginRight="15dip" - android:layout_marginTop="15dip" + android:layout_marginRight="50dip" + android:layout_marginTop="10dip" android:scaleType="center" android:visibility="gone"/> + <!-- Note: In this TextView the paddingRight="2" + attribute is required because otherwise the + text's drop shadow will be clipped. --> <TextView android:id="@+id/recording_time" android:layout_width="90dip" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_marginRight="55dip" - android:layout_marginTop="11dip" + android:layout_toLeftOf="@id/recording_indicator" + android:layout_alignTop="@id/recording_indicator" + android:layout_marginTop="20dip" + android:layout_marginRight="6dip" android:paddingRight="2dip" android:shadowColor="#c0000000" android:shadowDx="1" @@ -100,25 +105,15 @@ <LinearLayout android:visibility="gone" android:id="@+id/post_picture_panel" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" + android:layout_alignTop="@id/mode_indicator" + android:layout_toLeftOf="@id/mode_indicator" android:paddingLeft="7dip" - android:paddingRight="7dip" - android:paddingTop="6dip" - android:paddingBottom="6dip" + android:paddingRight="15dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal"> <com.android.camera.ActionMenuButton - android:id="@+id/capture" - android:drawableTop="@drawable/ic_menu_capture" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:text="@string/camera_capture" - style="@style/OnscreenActionIcon" - /> - <com.android.camera.ActionMenuButton android:id="@+id/play" android:drawableTop="@drawable/ic_menu_camera_play" android:layout_width="wrap_content" @@ -143,16 +138,16 @@ style="@style/OnscreenActionIcon" /> <com.android.camera.ActionMenuButton - android:id="@+id/accept" - android:drawableTop="@drawable/ic_menu_share" + android:id="@+id/attach" + android:drawableTop="@drawable/ic_menu_attach" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/camera_accept" + android:text="@string/camera_attach" style="@style/OnscreenActionIcon" /> <com.android.camera.ActionMenuButton android:id="@+id/cancel" - android:drawableTop="@drawable/ic_menu_delete" + android:drawableTop="@drawable/ic_menu_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/camera_cancel" diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml index e27bd7c..6ba66d1 100644 --- a/res/layout/viewimage.xml +++ b/res/layout/viewimage.xml @@ -90,14 +90,6 @@ android:orientation="horizontal"> <com.android.camera.ActionMenuButton - android:id="@+id/capture" - android:drawableTop="@drawable/ic_menu_capture" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/camera_capture" - style="@style/OnscreenActionIcon" - /> - <com.android.camera.ActionMenuButton android:id="@+id/gallery" android:drawableTop="@drawable/ic_menu_gallery" android:layout_width="wrap_content" @@ -129,6 +121,35 @@ android:text="@string/camera_toss" style="@style/OnscreenActionIcon" /> + <com.android.camera.ActionMenuButton + android:id="@+id/attach" + android:drawableTop="@drawable/ic_menu_attach" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/camera_attach" + style="@style/OnscreenActionIcon" + /> + <com.android.camera.ActionMenuButton + android:id="@+id/cancel" + android:drawableTop="@drawable/ic_menu_cancel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/camera_cancel" + style="@style/OnscreenActionIcon" + /> + <ImageView + android:id="@+id/mode_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_camera_indicator_photo" + android:background="@drawable/ic_btn_camera_background" + android:clickable="true" + android:focusable="true" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginRight="5dip" + android:layout_marginTop="15dip" + android:scaleType="center"/> </LinearLayout> <ImageView android:id="@+id/prev_image" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 5ef2ad1..c4ce6c8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Smazat"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Sdílet"</string> <string name="camera_set">"Použít jako"</string> <string name="camera_play">"Přehrát"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Vysoká (pro kartu SD)"</string> <string name="pref_camera_videoquality_dialogtitle">"Kvalita videa"</string> <string name="camerasettings">"Nastavení"</string> - <string name="image_gallery_NoImageView_text">"Nebyly nalezeny žádné fotografie."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Potvrdit smazání"</string> <string name="pref_gallery_confirm_delete_summary">"Před smazáním fotografií zobrazit potvrzení"</string> <string name="details_panel_title">"Podrobnosti"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 6e0f7ae..f51ae7a 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Löschen"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> - <string name="camera_share">"Weiterleiten"</string> + <string name="camera_share">"Senden"</string> <string name="camera_set">"Festlegen als"</string> <string name="camera_play">"Wiedergeben"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Hoch (für SD-Karte)"</string> <string name="pref_camera_videoquality_dialogtitle">"Videoqualität"</string> <string name="camerasettings">"Einstellungen"</string> - <string name="image_gallery_NoImageView_text">"Keine Bilder gefunden"</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Löschvorgang bestätigen"</string> <string name="pref_gallery_confirm_delete_summary">"Bestätigung vor dem Löschen von Bildern anzeigen"</string> <string name="details_panel_title">"Details"</string> @@ -145,7 +144,7 @@ <string name="videos_gallery_title">"Galerie"</string> <string name="pick_videos_gallery_title">"Video auswählen"</string> <string name="loading_progress_format_string">"noch <xliff:g id="COUNTER">%d</xliff:g>"</string> - <string name="sendImage">"Bild weiterleiten via"</string> + <string name="sendImage">"Bild senden via"</string> <string name="setImage">"Bild festlegen als"</string> <string name="sendVideo">"Video weiterleiten via"</string> <string name="movieviewlabel">"Filme"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index a2ac176..9a382bc 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -44,7 +44,6 @@ <!-- no translation found for camera_play (6388821030721929966) --> <skip /> <string name="camera_crop">"Recorte automático"</string> - <string name="camera_done">"Nueva imagen"</string> <string name="camera_tossing">"Eliminando…"</string> <string name="no_way_to_share_image">"Esta imagen no se puede guardar"</string> <string name="no_way_to_share_video">"Este vídeo no se puede compartir"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 3752049..5961eef 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Suprimir"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Compartir"</string> <string name="camera_set">"Establecer como"</string> <string name="camera_play">"Reproducir"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Alta (para tarjeta SD)"</string> <string name="pref_camera_videoquality_dialogtitle">"Calidad de vídeo"</string> <string name="camerasettings">"Configuración"</string> - <string name="image_gallery_NoImageView_text">"No se ha encontrado ninguna imagen."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Confirmar eliminaciones"</string> <string name="pref_gallery_confirm_delete_summary">"Mostrar confirmación antes de eliminar imágenes"</string> <string name="details_panel_title">"Detalles"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 5bb26d1..673947d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Supprimer"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Partager"</string> <string name="camera_set">"Définir en tant que"</string> <string name="camera_play">"Lire"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Haute (pour la carte SD)"</string> <string name="pref_camera_videoquality_dialogtitle">"Qualité vidéo"</string> <string name="camerasettings">"Paramètres"</string> - <string name="image_gallery_NoImageView_text">"Aucune image trouvée."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Confirmer les suppressions"</string> <string name="pref_gallery_confirm_delete_summary">"Afficher la confirmation avant de supprimer les images"</string> <string name="details_panel_title">"Détails"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 40823f3..9e93620 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Elimina"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Condividi"</string> <string name="camera_set">"Imposta come"</string> <string name="camera_play">"Riproduci"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Alta (per scheda SD)"</string> <string name="pref_camera_videoquality_dialogtitle">"Qualità video"</string> <string name="camerasettings">"Impostazioni"</string> - <string name="image_gallery_NoImageView_text">"Nessuna foto trovata."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Conferma eliminazioni"</string> <string name="pref_gallery_confirm_delete_summary">"Mostra conferma prima di eliminare le foto"</string> <string name="details_panel_title">"Dettagli"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 0667281..eabd3ed 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"削除"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"共有"</string> <string name="camera_set">"設定"</string> <string name="camera_play">"再生"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"高 (SDカード向け)"</string> <string name="pref_camera_videoquality_dialogtitle">"動画のクオリティ"</string> <string name="camerasettings">"設定"</string> - <string name="image_gallery_NoImageView_text">"写真がありません。"</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"削除を確認"</string> <string name="pref_gallery_confirm_delete_summary">"写真を削除する前に確認メッセージを表示"</string> <string name="details_panel_title">"詳細"</string> diff --git a/res/values-nl-rNL/strings.xml b/res/values-nl-rNL/strings.xml index ed0e00d..7ac8784 100644 --- a/res/values-nl-rNL/strings.xml +++ b/res/values-nl-rNL/strings.xml @@ -44,7 +44,6 @@ <!-- no translation found for camera_play (6388821030721929966) --> <skip /> <string name="camera_crop">"Automatisch inkorten"</string> - <string name="camera_done">"Nieuwe foto"</string> <string name="camera_tossing">"Bezig met verwijderen…"</string> <string name="no_way_to_share_image">"De afbeelding kan niet worden opgeslagen"</string> <string name="no_way_to_share_video">"Deze video kan niet worden gedeeld"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5ef4586..cb4f7c4 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Verwijderen"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Delen"</string> <string name="camera_set">"Instellen als"</string> <string name="camera_play">"Afspelen"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Hoog (voor SD-kaart)"</string> <string name="pref_camera_videoquality_dialogtitle">"Videokwaliteit"</string> <string name="camerasettings">"Instellingen"</string> - <string name="image_gallery_NoImageView_text">"Geen foto\'s gevonden."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Verwijderen bevestigen"</string> <string name="pref_gallery_confirm_delete_summary">"Vragen om bevestiging voordat foto\'s worden verwijderd"</string> <string name="details_panel_title">"Details"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 1a26fef..2f835b3 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Usuń"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Prześlij"</string> <string name="camera_set">"Ustaw jako"</string> <string name="camera_play">"Odtwórz"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Wysoka (dla karty SD)"</string> <string name="pref_camera_videoquality_dialogtitle">"Jakość wideo"</string> <string name="camerasettings">"Ustawienia"</string> - <string name="image_gallery_NoImageView_text">"Nie znaleziono zdjęć."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Potwierdzanie usuwania"</string> <string name="pref_gallery_confirm_delete_summary">"Prośba o potwierdzenie przy usuwaniu zdjęć"</string> <string name="details_panel_title">"Szczegóły"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index c3a6dc0..8ac9e6c 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"Удаление"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"Отправить"</string> <string name="camera_set">"Установить как"</string> <string name="camera_play">"Воспроизвести"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"Высокое (для карты SD)"</string> <string name="pref_camera_videoquality_dialogtitle">"Качество видео"</string> <string name="camerasettings">"Настройки"</string> - <string name="image_gallery_NoImageView_text">"Изображения не найдены."</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"Подтверждение удаления"</string> <string name="pref_gallery_confirm_delete_summary">"Просить подтверждения перед удалением изображений"</string> <string name="details_panel_title">"Сведения"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1fcdf47..e9d3b23 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"删除"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"共享"</string> <string name="camera_set">"设置为"</string> <string name="camera_play">"播放"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"高（对于 SD 卡）"</string> <string name="pref_camera_videoquality_dialogtitle">"视频质量"</string> <string name="camerasettings">"设置"</string> - <string name="image_gallery_NoImageView_text">"未找到图片。"</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"确认删除"</string> <string name="pref_gallery_confirm_delete_summary">"在删除图片之前显示确认"</string> <string name="details_panel_title">"详细信息"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index dda4fd6..f3b93c2 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -36,12 +36,10 @@ <string name="camera_toss">"刪除"</string> <!-- no translation found for camera_gallery (815753042966032398) --> <skip /> - <!-- no translation found for camera_capture (7723676100291210166) --> - <skip /> <string name="camera_share">"分享"</string> <string name="camera_set">"設為"</string> <string name="camera_play">"播放"</string> - <!-- no translation found for camera_accept (9043636509479164410) --> + <!-- no translation found for camera_attach (4048659554893435232) --> <skip /> <!-- no translation found for camera_cancel (8203341746672085747) --> <skip /> @@ -104,7 +102,8 @@ <string name="pref_camera_videoquality_entry_1">"高 (適用於 SD 卡)"</string> <string name="pref_camera_videoquality_dialogtitle">"影片品質"</string> <string name="camerasettings">"設定"</string> - <string name="image_gallery_NoImageView_text">"未找到相片。"</string> + <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) --> + <skip /> <string name="pref_gallery_confirm_delete_title">"刪除確認"</string> <string name="pref_gallery_confirm_delete_summary">"刪除相片前顯示確認"</string> <string name="details_panel_title">"詳細資料"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4eed424..8482a60 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -121,9 +121,6 @@ <!-- Lable for the button that takes the user to the camera pictures Gallery --> <string name="camera_gallery">Gallery</string> - <!-- Label for the button that takes the user back to still-image capture mode --> - <string name="camera_capture">Capture</string> - <!-- button indicating that the picture just taken should be shared by email, mms, etc --> <string name="camera_share">Share</string> @@ -133,9 +130,9 @@ <!-- button indicating that the video just taken should be played --> <string name="camera_play">Play</string> - <!-- button indicating that the video just taken should be accepted --> - <string name="camera_accept">Accept</string> - + <!-- button indicating that the video just taken should be accepted as an attachment --> + <string name="camera_attach">Attach</string> + <!-- button indicating that the video recording session should be canceled --> <string name="camera_cancel">Cancel</string> diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index ed2f7a4..c06f5e5 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -608,8 +608,12 @@ public class Camera extends Activity implements View.OnClickListener, SurfaceHol parameters.set("gps-longitude", String.valueOf(lon)); if (loc.hasAltitude()) parameters.set("gps-altitude", String.valueOf(loc.getAltitude())); - if (loc.getTime() != 0) - parameters.set("gps-timestamp", String.valueOf(loc.getTime())); + if (loc.getTime() != 0) { + // Location.getTime() is UTC in milliseconds. + // gps-timestamp is UTC in seconds. + long utcTimeSeconds = loc.getTime() / 1000; + parameters.set("gps-timestamp", String.valueOf(utcTimeSeconds)); + } } else { loc = null; } diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 9bfb860..2880ec1 100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -234,7 +234,7 @@ public class VideoCamera extends Activity implements View.OnClickListener, Surfa mPostPictureAlert = findViewById(R.id.post_picture_panel); int[] ids = new int[]{R.id.play, R.id.share, R.id.discard, - R.id.capture, R.id.cancel, R.id.accept, R.id.mode_indicator, + R.id.cancel, R.id.attach, R.id.mode_indicator, R.id.recording_indicator}; for (int id : ids) { findViewById(id).setOnClickListener(this); @@ -293,11 +293,8 @@ public class VideoCamera extends Activity implements View.OnClickListener, Surfa public void onClick(View v) { switch (v.getId()) { - case R.id.capture: - doStartCaptureMode(); - break; - case R.id.accept: + case R.id.attach: doReturnToPicker(true); break; @@ -332,8 +329,9 @@ public class VideoCamera extends Activity implements View.OnClickListener, Surfa case R.id.mode_indicator: if (mVideoFrame.getVisibility() == View.VISIBLE) { doStartCaptureMode(); + } else { + startVideoRecording(); } - startVideoRecording(); break; case R.id.recording_indicator: @@ -804,7 +802,7 @@ public class VideoCamera extends Activity implements View.OnClickListener, Surfa int normalVisible = ! isPick ? View.VISIBLE : View.GONE; mPostPictureAlert.findViewById(R.id.share).setVisibility(normalVisible); mPostPictureAlert.findViewById(R.id.discard).setVisibility(normalVisible); - mPostPictureAlert.findViewById(R.id.accept).setVisibility(pickVisible); + mPostPictureAlert.findViewById(R.id.attach).setVisibility(pickVisible); mPostPictureAlert.findViewById(R.id.cancel).setVisibility(pickVisible); mPostPictureAlert.setVisibility(View.VISIBLE); } diff --git a/src/com/android/camera/ViewImage.java b/src/com/android/camera/ViewImage.java index d1ef142..9760562 100644 --- a/src/com/android/camera/ViewImage.java +++ b/src/com/android/camera/ViewImage.java @@ -1072,9 +1072,25 @@ public class ViewImage extends Activity implements View.OnClickListener } mActionIconPanel = findViewById(R.id.action_icon_panel); - int[] ids = {R.id.capture, R.id.gallery, R.id.discard, R.id.share, R.id.setas}; - for(int id : ids) { - findViewById(id).setOnClickListener(this); + { + int[] pickIds = {R.id.attach, R.id.cancel}; + int[] normalIds = {R.id.gallery, R.id.setas, R.id.share, R.id.discard}; + int[] alwaysOnIds = {R.id.mode_indicator }; + int[] hideIds = pickIds; + int[] connectIds = normalIds; + if (isPickIntent()) { + hideIds = normalIds; + connectIds = pickIds; + } + for(int id : hideIds) { + findViewById(id).setVisibility(View.GONE); + } + for(int id : connectIds) { + findViewById(id).setOnClickListener(this); + } + for(int id : alwaysOnIds) { + findViewById(id).setOnClickListener(this); + } } Uri uri = getIntent().getData(); @@ -1480,7 +1496,7 @@ public class ViewImage extends Activity implements View.OnClickListener public void onClick(View v) { switch (v.getId()) { - case R.id.capture: { + case R.id.mode_indicator: { MenuHelper.gotoStillImageCapture(this); } break; |
