diff options
71 files changed, 237 insertions, 20 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 61088ec..23114db 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -65,6 +65,7 @@ </intent-filter> </activity> <activity android:name="com.android.camera.panorama.PanoramaActivity" + android:label="@string/pano_dialog_title" android:configChanges="orientation|screenSize|keyboardHidden" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" diff --git a/res/drawable-hdpi/ic_gallery.png b/res/drawable-hdpi/ic_gallery.png Binary files differnew file mode 100644 index 0000000..bfccaa6 --- /dev/null +++ b/res/drawable-hdpi/ic_gallery.png diff --git a/res/drawable-hdpi/list_pressed_holo.9.png b/res/drawable-hdpi/list_pressed_holo.9.png Binary files differdeleted file mode 100644 index 9eae8f4..0000000 --- a/res/drawable-hdpi/list_pressed_holo.9.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_gallery.png b/res/drawable-mdpi/ic_gallery.png Binary files differnew file mode 100644 index 0000000..b164c59 --- /dev/null +++ b/res/drawable-mdpi/ic_gallery.png diff --git a/res/drawable-mdpi/list_pressed_holo.9.png b/res/drawable-mdpi/list_pressed_holo.9.png Binary files differdeleted file mode 100644 index e3344b6..0000000 --- a/res/drawable-mdpi/list_pressed_holo.9.png +++ /dev/null diff --git a/res/drawable-w1024dp-hdpi/ic_gallery.png b/res/drawable-w1024dp-hdpi/ic_gallery.png Binary files differnew file mode 100644 index 0000000..18da118 --- /dev/null +++ b/res/drawable-w1024dp-hdpi/ic_gallery.png diff --git a/res/drawable-w1024dp-mdpi/ic_gallery.png b/res/drawable-w1024dp-mdpi/ic_gallery.png Binary files differnew file mode 100644 index 0000000..c977213 --- /dev/null +++ b/res/drawable-w1024dp-mdpi/ic_gallery.png diff --git a/res/drawable-w1024dp-xhdpi/ic_gallery.png b/res/drawable-w1024dp-xhdpi/ic_gallery.png Binary files differnew file mode 100644 index 0000000..0d6b27f --- /dev/null +++ b/res/drawable-w1024dp-xhdpi/ic_gallery.png diff --git a/res/drawable-xhdpi/ic_gallery.png b/res/drawable-xhdpi/ic_gallery.png Binary files differnew file mode 100644 index 0000000..eb189f8 --- /dev/null +++ b/res/drawable-xhdpi/ic_gallery.png diff --git a/res/drawable/setting_picker.xml b/res/drawable/setting_picker.xml index de225e3..a286d09 100644 --- a/res/drawable/setting_picker.xml +++ b/res/drawable/setting_picker.xml @@ -16,6 +16,6 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_activated="true" - android:drawable="@drawable/list_pressed_holo" /> + android:drawable="@drawable/list_pressed_holo_light" /> <item android:drawable="@android:color/transparent" /> </selector> diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index 6aba493..366393d 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -29,6 +29,7 @@ android:scaleType="center" android:clickable="true" android:focusable="true" + android:contentDescription="@string/accessibility_shutter_button" android:background="@drawable/btn_shutter" /> <include layout="@layout/mode_picker" /> </com.android.camera.ui.ControlPanelLayout> diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index 4fe6d45..764d6d6 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -41,6 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" + android:contentDescription="@string/accessibility_second_level_indicators" android:src="@drawable/ic_settings_holo_light" /> </com.android.camera.ui.IndicatorControlBar> @@ -63,6 +64,12 @@ android:layout_height="0dp" android:background="@color/mode_selection_border" android:visibility="gone" /> + <com.android.camera.ui.ColorFilterImageView + android:id="@+id/back_to_first_level" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:contentDescription="@string/accessibility_back_to_first_level" + android:src="@drawable/btn_close_settings" /> </com.android.camera.ui.SecondLevelIndicatorControlBar> </RelativeLayout> diff --git a/res/layout/mode_picker.xml b/res/layout/mode_picker.xml index 5cbc882..12c9618 100644 --- a/res/layout/mode_picker.xml +++ b/res/layout/mode_picker.xml @@ -24,12 +24,14 @@ android:layout_alignBottom="@+id/mode_selection" android:layout_width="match_parent" android:layout_height="55dp" + android:contentDescription="@string/accessibility_mode_picker" android:background="@drawable/bg_mode_picker"> <View android:layout_width="match_parent" android:layout_height="1dp" android:background="@android:color/white"/> <RelativeLayout android:orientation="horizontal" + android:contentDescription="@string/empty" android:layout_width="match_parent" android:layout_height="match_parent"> <com.android.camera.ui.RotateImageView android:id="@+id/mode_0" @@ -39,12 +41,14 @@ android:layout_alignParentLeft="true" android:layout_marginLeft="8dp" android:scaleType="fitCenter" + android:contentDescription="@string/empty" android:src="@drawable/ic_switch_video_holo_light" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_1" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_centerInParent="true" android:scaleType="fitCenter" + android:contentDescription="@string/empty" android:src="@drawable/ic_switch_camera_holo_light" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_2" android:layout_width="32dp" @@ -53,6 +57,7 @@ android:layout_alignParentRight="true" android:layout_marginRight="8dp" android:scaleType="fitCenter" + android:contentDescription="@string/empty" android:src="@drawable/ic_switch_pan_holo_light" /> </RelativeLayout> </RelativeLayout> @@ -72,6 +77,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true"> <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera" + android:contentDescription="@string/switch_to_camera_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" @@ -79,6 +85,7 @@ android:background="@drawable/bg_pressed" android:src="@drawable/ic_switch_camera_holo_light" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_video" + android:contentDescription="@string/switch_to_video_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" @@ -86,6 +93,7 @@ android:background="@drawable/bg_pressed" android:src="@drawable/ic_switch_video_holo_light" /> <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama" + android:contentDescription="@string/switch_to_panorama_label" android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="center" diff --git a/res/layout/review_thumbnail.xml b/res/layout/review_thumbnail.xml index 1d80687..1f94e27 100644 --- a/res/layout/review_thumbnail.xml +++ b/res/layout/review_thumbnail.xml @@ -21,5 +21,6 @@ android:clickable="true" android:focusable="false" android:visibility="gone" + android:contentDescription="@string/accessibility_review_thumbnail" android:background="@drawable/border_last_picture"> </com.android.camera.ui.RotateImageView> diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml index 416f46e..c9beb3a 100644 --- a/res/layout/share_popup.xml +++ b/res/layout/share_popup.xml @@ -46,17 +46,38 @@ <ImageView android:id="@+id/play" style="@style/ReviewPlayIcon"/> </RelativeLayout> - <FrameLayout + <LinearLayout android:layout_width="@dimen/share_item_width" android:layout_height="match_parent" + android:orientation="vertical" android:layout_gravity="right" android:background="@color/share_icon_background"> + <com.android.camera.ui.RotateLayout + android:layout_marginTop="8dip" + android:id="@+id/goto_gallery_button_rotate" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + <ImageButton + android:id="@+id/goto_gallery_button" + android:background="?android:attr/selectableItemBackground" + android:layout_gravity="center" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_gallery" /> + </com.android.camera.ui.RotateLayout> + <View + android:layout_width="match_parent" + android:layout_margin="8dip" + android:layout_height="1dp" + android:background="#5affffff" /> + <ListView android:id="@+id/share_list" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:choiceMode="singleChoice" style="@android:style/Widget.Holo.ListView" /> - </FrameLayout> + </LinearLayout> </FrameLayout> </FrameLayout> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index ce69bd8..fd4fe91 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Plaas jou toestel op \'n stewige oppervlak en maak seker daar is geen beweging agter jou nie. "\n\n"Stap dan uit die kamera se sigveld."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan nie gekies word as die effek aan is nie."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Neem \'n foto tydens video-opname deur op die voorskou-skerm te tik."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Vee effekte uit"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Lawwe gesigte"</string> <string name="effect_background" msgid="6909716214852487679">"Agtergrond"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index aaca606..a91638a 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"መሳሪያዎን በዝርግ ስፍራ ላይ ያስቀምጡ እና ከእርስዎ ጀርባ ምንም ዓይነት መነቃነቅ እንደሌለ እርግጠኛ ሁን፡፡"\n\n" ከዛ በኋላ ከካሜራው እይታ ለቀው ይውጡ፡፡"</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"ማሳመሪያው ሲበራ ይህ ሊመረጥ አይችልም::"</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"የቅድመ ዕይታ ማያን ነካ በማድረግ በቪዲዮ ቀረፃ ጊዜ ፎቶ አንሳ።"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"ማሳመሪያዎች አጽዳ"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"ሞኛሞኝ ፊቶች"</string> <string name="effect_background" msgid="6909716214852487679">"ዳራ"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 23b9f4e..07d67ee 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"ضع الجهاز على سطح ثابت وتأكد من عدم وجود حركة خلفك."\n\n"ثم انتقل إلى وضع الكاميرا."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"هذا الإعداد غير قابل للتحديد عند تشغيل التأثير."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"التقاط صورة أثناء تسجيل الفيديو بالنقر على شاشة المعاينة."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"محو التأثيرات"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"وجوه مضحكة"</string> <string name="effect_background" msgid="6909716214852487679">"الخلفية"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 3208d06..8d2a750 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -115,7 +115,9 @@ <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Изберете свой"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Поставете устройството си върху стабилна повърхност и се уверете, че зад вас нищо не се движи."\n\n"След което се отдръпнете от зрителното поле на камерата."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Това не може да се избира при включен ефект."</string> - <string name="video_snapshot_hint" msgid="6479115859014094906">"Напр. снимка по време на видеозапис, докосвайки екрана за визуал."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Напр. снимайте при видеозапис, докосвайки екрана за визуализация"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Изчистване на ефектите"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Смешни лица"</string> <string name="effect_background" msgid="6909716214852487679">"Фон"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index f87ccd3..1882f9a 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -116,6 +116,7 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Col·loca el dispositiu sobre una superfície estable i assegura\'t que no hi hagi res que es mogui darrere teu."\n\n"A continuació, surt del davant de la càmera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Aquesta opció no es pot seleccionar quan l\'efecte està activat."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Per fer una foto durant l\'enregistrament de vídeo, pica la pantalla de visualització prèvia."</string> + <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Les instantànies del vídeo es desactiven quan hi ha els efectes especials activats."</string> <string name="clear_effects" msgid="5485339175014139481">"Esborra efectes"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Ganyotes"</string> <string name="effect_background" msgid="6909716214852487679">"Fons"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8fc4acf..544e5dd 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Umístěte zařízení na pevný povrch a zkontrolujte, zda se za vámi nic nehýbe."\n\n"Poté ustupte ze záběru kamery."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavení nelze vybrat, pokud je efekt zapnutý."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Během nahrávání videa lze fotit klepnutím na obrazovku náhledu."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Vymazat efekty"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Bláznivé tváře"</string> <string name="effect_background" msgid="6909716214852487679">"Pozadí"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 1aa4f0e..9a73b7b 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Placer enheden på en jævn overflade, og sørg for, at der ikke er noget i baggrunden, der bevæger sig."\n\n"Gå derefter ud af billedet."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dette kan ikke vælges, når effekten er slået til."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Tryk på eksempelskærmen for at tage et foto under videooptagelse."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Ryd effekter"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Skøre ansigter"</string> <string name="effect_background" msgid="6909716214852487679">"Baggrund"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index edeff88..8f6a803 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -98,7 +98,7 @@ <string name="pano_dialog_prepare_preview" msgid="4788441554128083543">"Panorama wird vorbereitet..."</string> <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"Panorama konnte nicht gespeichert werden."</string> <string name="pano_dialog_title" msgid="5755531234434437697">"Panorama"</string> - <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama wird aufgenommen."</string> + <string name="pano_capture_indication" msgid="7431983072966619171">"Panorama wird aufgenommen..."</string> <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"Speichern..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"Zum Fokussieren tippen"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"Effekte"</string> @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Legen Sie Ihr Gerät auf eine stabile Oberfläche und achten Sie darauf, dass sich hinter Ihnen nichts bewegt."\n\n"Treten Sie anschließend aus dem Bild."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Einstellung nicht wählbar, wenn Effekt aktiviert"</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Durch Tippen Foto während Videoaufzeichnung aufnehmen"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Effekte löschen"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Lustige Gesichter"</string> <string name="effect_background" msgid="6909716214852487679">"Hintergrund"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index c0202f2..f5f160b 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Τοποθετήστε τη συσκευή σας σε μια σταθερή επιφάνεια και βεβαιωθείτε ότι δεν υπάρχουν κινήσεις πίσω σας."\n\n" Στη συνέχεια, απομακρυνθείτε από το οπτικό πεδίο της κάμερας."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Αδύνατη η επιλογή του όταν το εφέ είναι ενεργό."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Τραβ. μια φωτογρ. κατά την εγγρ. βίντεο πατώντας την οθ.προεπισκ."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Διαγραφή εφέ"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Αστεία πρόσωπα"</string> <string name="effect_background" msgid="6909716214852487679">"Φόντο"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 1795d9a..ed1caa2 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -116,6 +116,7 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Place your device on a steady surface and make sure that there\'s no movement behind you."\n\n"Then move out of the camera\'s view."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"This is not selectable when the effect is on."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Take a photo during video recording by tapping the preview screen."</string> + <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Video snapshot is disabled when special effects are on."</string> <string name="clear_effects" msgid="5485339175014139481">"Clear effects"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Silly faces"</string> <string name="effect_background" msgid="6909716214852487679">"Background"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index afbc17f..66165b4 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -115,7 +115,9 @@ <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Elige el tuyo"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo sobre una superficie firme y asegúrate de que no se produzca ningún movimiento detrás de ti."\n\n"Luego ubícate fuera del alcance de la cámara."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede elegir config. si el efecto está act."</string> - <string name="video_snapshot_hint" msgid="6479115859014094906">"Para tomar fotos en una grabación, toca la pant. de vista prev."</string> + <string name="video_snapshot_hint" msgid="6479115859014094906">"Para tomar fotos en una grabación, toca la pant. de vista previa."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Borrar efectos"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Caras graciosas"</string> <string name="effect_background" msgid="6909716214852487679">"Fondo"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 972afc4..f15b4e1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -44,14 +44,14 @@ <string name="pref_camera_id_title" msgid="6023059405578511534">"Seleccionar cámara"</string> <string name="pref_camera_id_entry_back" msgid="5142699735103692485">"Trasera"</string> <string name="pref_camera_id_entry_front" msgid="5668958706828733669">"Delantera"</string> - <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Almacenar ubicación"</string> + <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Guardar ubicación"</string> <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desactivado"</string> <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activada"</string> <string name="pref_video_quality_title" msgid="8245379279801096922">"Calidad de vídeo"</string> <string name="pref_video_time_lapse_frame_interval_title" msgid="5262531404348504642">"Intervalo de tiempo"</string> <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string> <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string> - <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string> + <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño imagen"</string> <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"Píxeles de 5 M"</string> <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"Píxeles de 3 M"</string> <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"Píxeles de 2 M"</string> @@ -63,7 +63,7 @@ <string name="pref_camera_focusmode_entry_auto" msgid="7374820710300362457">"Automático"</string> <string name="pref_camera_focusmode_entry_infinity" msgid="3413922419264967552">"Infinito"</string> <string name="pref_camera_focusmode_entry_macro" msgid="4424489110551866161">"Macro"</string> - <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Modo flash"</string> + <string name="pref_camera_flashmode_title" msgid="2287362477238791017">"Flash"</string> <string name="pref_camera_flashmode_entry_auto" msgid="7288383434237457709">"Automático"</string> <string name="pref_camera_flashmode_entry_on" msgid="5330043918845197616">"Activado"</string> <string name="pref_camera_flashmode_entry_off" msgid="867242186958805761">"Desactivado"</string> @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Coloca el dispositivo en una superficie plana y comprueba que no se produzca ningún movimiento detrás."\n\n"A continuación, colócate fuera de la vista de la cámara."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"No se puede seleccionar si el efecto está activado."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Toca la pantalla de vista previa para hacer una foto mientras grabas vídeo."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Borrar efectos"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Caras graciosas"</string> <string name="effect_background" msgid="6909716214852487679">"Fondo"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index dec6069..32e512c 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"دستگاه خود را بر روی یک سطح ثابت و محکم قرار دهید و مطمئن شوید هیچ حرکتی پشت سر شما وجود نداشته باشد."\n\n"سپس از نمای دوربین خارج شوید."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"هنگامی که جلوه روشن است قابل انتخاب نیست."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"هنگام ضبط ویدیو با ضربه زدن روی صفحه پیش نمایش عکس بگیرید."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"پاک کردن جلوهها"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"چهرههای احمقانه"</string> <string name="effect_background" msgid="6909716214852487679">"پسزمینه"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 665bb1c..16044c5 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Sijoita laite vakaalle alustalle ja varmista, että taustalla ei ole liikkuvia kohteita."\n\n"Astu sitten pois kuvasta."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tämä ei ole valittavissa, kun tehoste on käytössä."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Ota kuva videokuvauksen aikana napauttamalla esikatseluruutua."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Tyhjennä tehosteet"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Hauskat kasvot"</string> <string name="effect_background" msgid="6909716214852487679">"Tausta"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 03fcb17..13eae42 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Placez l\'appareil sur une surface stable, et assurez-vous qu\'il n\'y a pas de mouvement derrière vous."\n\n"Sortez ensuite du champ de vision de l\'appareil photo."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Sélection impossible lorsque l\'effet est activé."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Appuyez sur écran aperçu pour prendre photo pendant enreg. vidéo"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Effacer les effets"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Expressions amusantes"</string> <string name="effect_background" msgid="6909716214852487679">"Arrière-plan"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 558e956..bccd3aa 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite uređaj na stabilnu površinu i provjerite da nema kretanja iza vas."\n\n"Tada izađite iz vidokruga kamere."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"To se ne može odabrati kada je efekt uključen."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Dok snimate videozapis, fotografirajte doticanjem zaslona pregleda."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Obriši efekte"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Budalasta lica"</string> <string name="effect_background" msgid="6909716214852487679">"Pozadina"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 7a888b0..63f0a52 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Helyezze eszközét egy stabil felületre, és bizonyosodjon meg arról, hogy Ön mögött nincs mozgás."\n\n"Ezután lépjen ki a kamera látószögéből."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ez nem választható, ha az effekt be van kapcsolva."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Képkészítés videofelvétel közben: előnézeti képernyő megérintése"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Effektek törlése"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Bolondos arcok"</string> <string name="effect_background" msgid="6909716214852487679">"Háttér"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 5bf0e14..3788ad2 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -114,8 +114,10 @@ <string name="effect_backdropper_disco" msgid="8494822051982972854">"Disko"</string> <string name="effect_backdropper_gallery" msgid="1393338187462207584">"Pilih sendiri"</string> <string name="bg_replacement_message" msgid="7540788298745332389">"Tempatkan perangkat pada permukaan yang stabil dan pastikan tidak ada gerakan di belakang Anda."\n\n"Setelah itu keluarlah dari pandangan kamera."</string> - <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setelan ini tidak dapat dipilih jika efek aktif."</string> + <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setelan ini tidak dapat dipilih jika efek dihidupkan."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Mengambil foto saat merekam video dengan mengetuk layar pratinjau."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Hapus efek"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Wajah konyol"</string> <string name="effect_background" msgid="6909716214852487679">"Latar belakang"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index feb890f..703d14b 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -18,7 +18,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="camera_error_title" msgid="6484667504938477337">"Errore fotocamera"</string> <string name="cannot_connect_camera" msgid="8029009101380114174">"Impossibile collegarsi alla fotocamera."</string> - <string name="camera_disabled" msgid="8923911090533439312">"La fotocamera è stata disattivata a causa di criteri di protezione."</string> + <string name="camera_disabled" msgid="8923911090533439312">"La fotocamera è stata disattivata in base a norme di sicurezza."</string> <string name="camera_label" msgid="6346560772074764302">"Fotocamera"</string> <string name="video_camera_label" msgid="2899292505526427293">"Videocamera"</string> <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Foto"</string> @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Posiziona il dispositivo su una superficie stabile e assicurati che non ci sia qualcosa in movimento dietro di te."\n\n"Dopodiché esci dall\'inquadratura della fotocamera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Non selezionabile quando l\'effetto è attivo."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Scatta una foto durante il video toccando lo schermo di anteprima."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Cancella effetti"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Faccine"</string> <string name="effect_background" msgid="6909716214852487679">"Sfondo"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 3e5e4c1..1769695 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"הנח את המכשיר על גבי משטח יציב והקפד לוודא שאין תנועה מאחוריך."\n\n"לאחר מכן, צא מטווח הראייה של המצלמה."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"לא ניתן לבחור באפשרות זו כאשר האפקט מופעל."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"צלם תמונה במהלך הקלטת וידאו על ידי הקשה על מסך התצוגה המקדימה."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"נקה אפקטים"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"פרצופים מצחיקים"</string> <string name="effect_background" msgid="6909716214852487679">"רקע"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 1d96039..e2bdd96 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"安定した平らな場所にデバイスを置き、後方に動いているものがないか確認します。"\n\n"次に、カメラの視野の外に出ます。"</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"効果がONのときは選択できません。"</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"動画の録画中にプレビュー画面をタップすると静止画を撮影できます。"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"効果設定をクリア"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"変な顔"</string> <string name="effect_background" msgid="6909716214852487679">"背景"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 98b4ca8..e740b05 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"기기를 평평한 바닥에 올려놓고 뒤에 움직이는 물체가 없는지 확인합니다. "\n\n"그런 다음 카메라 뷰 밖으로 비켜섭니다."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"효과를 사용 중일 때는 선택할 수 없습니다."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"동영상을 촬영하는 동안 미리보기 화면을 탭하여 사진을 찍을 수 있습니다."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"효과 제거"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"웃긴 얼굴"</string> <string name="effect_background" msgid="6909716214852487679">"배경"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f4d7d1f..7aa43de 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Įrenginį padėkite ant stabilaus paviršiaus ir įsitikinkite, kad už jūsų niekas nejuda."\n\n"Pasitraukite iš kameros regėjimo lauko."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Negalima pasirinkti, kai įjungtas efektas."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Kai įrašomas vaizdo įr., fotograf. paliesdami peržiūros ekraną."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Išvalyti efektus"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Juokingi veidai"</string> <string name="effect_background" msgid="6909716214852487679">"Fonas"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 450499c..db45f7f 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Novietojiet ierīci uz stabilas virsmas un pārliecinieties, ka aiz jums nenotiek nekāda kustība."\n\n"Pēc tam izejiet no kameras skata."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Šo iestat. nevar atlasīt, kad ir ieslēgts efekts."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografējiet videoieraksta laikā, pieskaroties priekšskat. ekr."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Noņemt efektus"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Smieklīgas sejas izt."</string> <string name="effect_background" msgid="6909716214852487679">"Fons"</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index e7002b0..9884e2f 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Letakkan peranti anda di atas permukaan yang stabil dan pastikan tidak ada pergerakan di belakang anda."\n" "\n" Kemudian berjalan keluar dari pandangan kamera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ini tidak boleh dipilih apabila kesan dihidupkan."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Ambil gambar semasa rakaman video dengan mengetik pada skrin pratonton."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Padamkan kesan"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Muka bodoh"</string> <string name="effect_background" msgid="6909716214852487679">"Latar belakang"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index d4bbef4..d68a68f 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Plassér enheten på et stødig underlag og sørg for at det ikke er noen bevegelser bak deg."\n\n"Deretter flytter du deg bort fra kamerabildet."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Du kan ikke velge dette når effekten er aktivert."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Ta bilde under videoopptaket ved å trykke på forhåndsvisningen."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Fjern effekter"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Morsomme ansikter"</string> <string name="effect_background" msgid="6909716214852487679">"Bakgrunn"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5b0f143..23dabfd 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Plaats uw apparaat op een stevige ondergrond en zorg ervoor dat er geen beweging achter u te zien is."\n\n"Stap vervolgens uit beeld."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Dit kan niet worden geselecteerd wanneer het effect is ingeschakeld."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Tik voor een foto bij video-opnamen op het voorbeeldscherm."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Effecten wissen"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Gekke gezichten"</string> <string name="effect_background" msgid="6909716214852487679">"Achtergrond"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index b3f0eb6..70d67b4 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Umieść urządzenie na stabilnej powierzchni i upewnij się, że za Tobą nic się nie dzieje."\n\n"Następnie wyjdź z pola widzenia aparatu."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Opcji nie można wybrać, gdy efekt jest włączony."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Zrób zdjęcie podczas nagrywania filmu, klikając ekran podglądu."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Usuń efekty"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Zabawne twarze"</string> <string name="effect_background" msgid="6909716214852487679">"Tło"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index de8b3f4..6a5063a 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o aparelho numa superfície estável e certifique-se de que não existe movimento atrás de si."\n\n"Em seguida, saia do alcance visual da câmara."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Isto não é selecionável com o efeito ativado."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma fotografia durante a gravação de vídeo tocando no ecrã de pré-visualização."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Limpar efeitos"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Caretas"</string> <string name="effect_background" msgid="6909716214852487679">"Fundo"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index a98c731..04ffd24 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Coloque o dispositivo sobre uma superfície estável sem movimento atrás de você."\n\n"Em seguida, saia do campo de visão da câmera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Não é possível selecionar com o efeito ativado."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Tire uma foto ao gravar um vídeo tocando na tela de visualização."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Clarear efeitos"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Caretas"</string> <string name="effect_background" msgid="6909716214852487679">"Plano de fundo"</string> diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index f38727b..d568ac2 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -153,6 +153,8 @@ <skip /> <!-- no translation found for video_snapshot_hint (6479115859014094906) --> <skip /> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <!-- no translation found for clear_effects (5485339175014139481) --> <skip /> <!-- no translation found for effect_silly_faces (3214174716769421248) --> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 0cab9cf..2a22e21 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Aşezaţi dispozitivul pe o suprafaţă stabilă şi asiguraţi-vă că nu există mişcare în spatele dvs."\n\n"Apoi, ieşiţi din vizorul camerei foto."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Setarea nu poate fi selectată cu efectul activat."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Fotografiaţi când înregistraţi video atingând ecranul."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Ştergeţi efectul"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Feţe stupide"</string> <string name="effect_background" msgid="6909716214852487679">"Fundal"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1c42ee1..66c1d10 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -51,7 +51,7 @@ <string name="pref_video_time_lapse_frame_interval_title" msgid="5262531404348504642">"Интервал замедленной съемки"</string> <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки камеры"</string> <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки видеокамеры"</string> - <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фотографии"</string> + <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фото"</string> <string name="pref_camera_picturesize_entry_2592x1936" msgid="1871154452633783418">"5 мегапикселей"</string> <string name="pref_camera_picturesize_entry_2048x1536" msgid="8763841848102861602">"3 мегапикселя"</string> <string name="pref_camera_picturesize_entry_1600x1200" msgid="3802531502504271124">"2 мегапикселя"</string> @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Поставьте устройство на твердую поверхность и убедитесь, что позади вас нет движущихся предметов или людей."\n\n"Затем отойдите от камеры."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Недоступно при использовании этого эффекта."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Чтобы сделать снимок при видеосъемке, нажмите на экран просмотра."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Убрать эффекты"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Смешные рожицы"</string> <string name="effect_background" msgid="6909716214852487679">"Фон"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 7f60df2..6d4beaa 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Umiestnite zariadenie na pevný povrch a uistite sa, že sa za vami nič nehýbe."\n\n"Potom ustúpte zo záberu fotoaparátu."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Nastavenie nie je možné vybrať pri zapnutom efekte."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Počas nahrávania videa môžete fotiť klepnutím na obrazovku ukážky."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Vymazať efekty"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Bláznivé tváre"</string> <string name="effect_background" msgid="6909716214852487679">"Pozadie"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 006ddc8..e457da1 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Postavite napravo na stabilno površino in se prepričajte, da za vami ni gibanja."\n\n"Nato se umaknite iz prizora."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Tega ni mogoče izbrati, ko je vklopljen učinek."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Če želite med snemanjem videa fotografirati, tapnite zaslon za predogled."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Počisti učinke"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Norčavi obrazi"</string> <string name="effect_background" msgid="6909716214852487679">"Ozadje"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 2acc425..db0fd1e 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Поставите уређај на стабилну површину и уверите се да се иза вас ништа не помера."\n\n"Затим изађите из кадра камере."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Ово није могуће изабрати када је ефекат укључен."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Снимите слику током снимања видео снимка додиром на екран за преглед."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Обриши ефекте"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Смешна лица"</string> <string name="effect_background" msgid="6909716214852487679">"Позадина"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index adf90dc..4f3c091 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -116,6 +116,7 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Placera enheten på en stadig yta och se till att det är lugnt bakom dig."\n\n"Gå åt sidan så du inte syns på bilden."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Det går inte att välja detta när effekten är på."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Knacka lätt på skärmen om du vill fota under inspelningen."</string> + <string name="disable_video_snapshot_hint" msgid="4957723267826476079">"Ögonblicksbilden av en video inaktiveras när specialeffekter är aktiverade."</string> <string name="clear_effects" msgid="5485339175014139481">"Ta bort effekter"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Roliga grimaser"</string> <string name="effect_background" msgid="6909716214852487679">"Bakgrund"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index d2bd823..17f7fd6 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Weka kifaa chako sehemu imara isiyoyumba na hakikisha hakuna harakati zozote nyuma yako."\n" "\n" Kisha toka mbele ya kamera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hii haiwezi kuchagulika wakati athari imewashwa."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Piga picha wakati video inarekodi kwa kugusa kwenye skrini ya onyesho la awali."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Athari Wazi"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Sura pumbavu"</string> <string name="effect_background" msgid="6909716214852487679">"Mandhari nyuma"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 311674c..ec70cdc 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -99,7 +99,7 @@ <string name="pano_dialog_panorama_failed" msgid="6286761234243958706">"ไม่สามารถบันทึกภาพพาโนรามา"</string> <string name="pano_dialog_title" msgid="5755531234434437697">"พาโนรามา"</string> <string name="pano_capture_indication" msgid="7431983072966619171">"กำลังจับภาพพาโนรามา"</string> - <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"กำลังบันทึก..."</string> + <string name="pano_review_saving_indication_str" msgid="6239883905955317473">"บันทึก..."</string> <string name="tap_to_focus" msgid="6417403734418828035">"แตะเพื่อโฟกัส"</string> <string name="pref_video_effect_title" msgid="8243182968457289488">"เอฟเฟ็กต์"</string> <string name="effect_none" msgid="3601545724573307541">"ไม่มี"</string> @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"วางอุปกรณ์ของคุณบนพื้นผิวที่มั่นคงและแน่ใจว่าไม่มีการเคลื่อนไหวด้านหลังคุณ"\n\n"จากนั้นออกจากมุมมองของกล้อง"</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"เลือกการตั้งค่านี้ไม่ได้หากเปิดใช้เอฟเฟ็กต์อยู่"</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"ถ่ายภาพระหว่างการบันทึกวิดีโอโดยการแตะบนหน้าจอดูตัวอย่าง"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"ล้างเอฟเฟ็กต์"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"หน้าตลก"</string> <string name="effect_background" msgid="6909716214852487679">"พื้นหลัง"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index b1adfa0..882c783 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Ipatong ang iyong device sa isang matatag na bagay at tiyaking walang kumikilos sa iyong likuran."\n\n"Pagkatapos ay umalis sa view ng camera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Hindi ito napipili kapag naka-on ang effect."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Kumuha ng larawan habang nagre-record ng video sa pamamagitan ng pagtapik sa screen ng preview."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Mga clear na effect"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Mga katawa-tawang mukha"</string> <string name="effect_background" msgid="6909716214852487679">"Background"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 4fa3dac..b33df35 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Cihazınızı sabit bir yüzeye yerleştirin ve arkanızda hiçbir hareket olmadığından emin olun."\n\n"Sonra kameranın görüş alanından çıkın."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Efekt açıkken bu ayar seçilemez."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Video kaydında önizleme ekranına hafifçe vurarak fotoğraf çekin."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Efektleri temizle"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Komik suratlar"</string> <string name="effect_background" msgid="6909716214852487679">"Arka plan"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 23a723f..812bde5 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Покладіть свій пристрій на нерухому поверхню та переконайтеся, що за вами немає жодного руху."\n\n"Потім вийдіть із поля зору камери."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Це не можна вибрати, якщо ввімкнено ефект."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Зробіть фото під час відеозйомки, торкнувшись екрана перегляду."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Очистити ефекти"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Кумедні обличчя"</string> <string name="effect_background" msgid="6909716214852487679">"Фон"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index a63f321..02351da 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Đặt thiết bị của bạn lên bề mặt chắc chắn và đảm bảo không có chuyển động nào phía sau bạn."\n\n"Sau đó, thoát khỏi chế độ xem của máy ảnh."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Không thể chọn cài đặt này khi hiệu ứng này bật."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Chụp ảnh khi đang quay video bằng cách bấm vào màn hình xem trước."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Xóa hiệu ứng"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Khuôn mặt ngớ ngẩn"</string> <string name="effect_background" msgid="6909716214852487679">"Nền"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index b838718..7119905 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"将您的设备放置在一个平稳的表面上，并确保您的身后没有任何移动的物体。"\n\n"然后走出摄像头的取景范围。"</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"无法在效果开启时选择此设置。"</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"录制视频时点按预览屏幕可拍摄照片。"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"趣味表情"</string> <string name="effect_background" msgid="6909716214852487679">"背景"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index be7cab8..44a1872 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"將您的裝置放在平穩的表面上，確定自己身後沒有移動的物體。"\n\n"然後離開相機鏡頭的視野範圍。"</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"效果啟用時無法選取這項設定。"</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"影片錄製期間，只要輕按預覽畫面即可拍攝相片。"</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"清除效果"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"耍笨臉"</string> <string name="effect_background" msgid="6909716214852487679">"背景"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index cefef74..c963b79 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -116,6 +116,8 @@ <string name="bg_replacement_message" msgid="7540788298745332389">"Beka i-device yakho endaweni enganyakazi bese uqinisekisa ukuthi akukho ukunyakaza ngemuva kwakho."\n\n"Bese usuka lapho kubheke khona ikhamera."</string> <string name="not_selectable_in_effect" msgid="5093306709878914151">"Lokhu akukhetheki uma isinandisi sisavulekile."</string> <string name="video_snapshot_hint" msgid="6479115859014094906">"Thatha isithombe ngesikhathi sokuqoshwa kwevidyo ngokuchofoza eskrinini sokubuka ngaphambili kokudlala."</string> + <!-- no translation found for disable_video_snapshot_hint (4957723267826476079) --> + <skip /> <string name="clear_effects" msgid="5485339175014139481">"Izinandisi ezicacile"</string> <string name="effect_silly_faces" msgid="3214174716769421248">"Ubuso obungasile"</string> <string name="effect_background" msgid="6909716214852487679">"Ingemuva"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0bdb819..7cc61f4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -329,4 +329,28 @@ <!-- Title of category for background replacement effects. [CHAR LIMIT=26] --> <string name="effect_background">Background</string> + + <!-- The shutter button. [CHAR LIMIT = NONE] --> + <string name="accessibility_shutter_button">Shutter button</string> + <!-- The button to review the thumbnail. [CHAR LIMIT = NONE] --> + <string name="accessibility_review_thumbnail">Most recent photo</string> + <!-- The front/back camera switch. [CHAR LIMIT = NONE] --> + <string name="accessibility_camera_picker">Front and back camera switch</string> + <!-- The mode picker to switch between camera, video and panorama. [CHAR LIMIT = NONE] --> + <string name="accessibility_mode_picker">Camera, video or panorama selector</string> + <!-- The button to switch to the second-level indicators of the camera settings. [CHAR LIMIT = NONE] --> + <string name="accessibility_second_level_indicators">More setting controls</string> + <!-- The button to back to the first-level indicators of the camera settings. [CHAR LIMIT = NONE] --> + <string name="accessibility_back_to_first_level">Close setting controls</string> + <!-- The zoom control button. [CHAR LIMIT = NONE] --> + <string name="accessibility_zoom_control">Zoom control</string> + <!-- The decrement button in camera preference such as exposure, picture size. [CHAR LIMIT = NONE] --> + <string name="accessibility_decrement">Decrease %1$s</string> + <!-- The increment button in camera preference such as exposure, picture size. [CHAR LIMIT = NONE] --> + <string name="accessibility_increment">Increase %1$s</string> + <!-- The on/off switch in camera settings, such as store location. [CHAR LIMIT = NONE] --> + <string name="accessibility_switch">%1$s switch</string> + + <!-- TODO: remove the string as it is a work-around solution to bypass the default speak of the element type. --> + <string name="empty" translatable="false">" "</string> </resources> diff --git a/src/com/android/camera/ui/AbstractIndicatorButton.java b/src/com/android/camera/ui/AbstractIndicatorButton.java index 037a273..a661586 100644 --- a/src/com/android/camera/ui/AbstractIndicatorButton.java +++ b/src/com/android/camera/ui/AbstractIndicatorButton.java @@ -50,6 +50,8 @@ public abstract class AbstractIndicatorButton extends RotateImageView implements HIGHLIGHT_COLOR = context.getResources().getColor(R.color.review_control_pressed_color); setScaleType(ImageView.ScaleType.CENTER); PopupManager.getInstance(context).setOnOtherPopupShowedListener(this); + // Set the click listener to help the comprehension of the accessibility. + setClickable(true); } @Override diff --git a/src/com/android/camera/ui/CameraPicker.java b/src/com/android/camera/ui/CameraPicker.java index 78e2b27..ac8b8a8 100644 --- a/src/com/android/camera/ui/CameraPicker.java +++ b/src/com/android/camera/ui/CameraPicker.java @@ -38,6 +38,8 @@ public class CameraPicker extends RotateImageView implements View.OnClickListene public CameraPicker(Context context) { super(context); setImageResource(mImageResource); + setContentDescription(getResources().getString( + R.string.accessibility_camera_picker)); } public static void setImageResourceId(int imageResource) { diff --git a/src/com/android/camera/ui/InLineSettingItem.java b/src/com/android/camera/ui/InLineSettingItem.java index 6f84e6f..bf6bdb2 100644 --- a/src/com/android/camera/ui/InLineSettingItem.java +++ b/src/com/android/camera/ui/InLineSettingItem.java @@ -21,6 +21,7 @@ import com.android.camera.R; import android.content.Context; import android.util.AttributeSet; +import android.view.accessibility.AccessibilityEvent; import android.widget.LinearLayout; import android.widget.TextView; @@ -70,6 +71,7 @@ public abstract class InLineSettingItem extends LinearLayout { mListener.onSettingChanged(); } updateView(); + sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); return true; } diff --git a/src/com/android/camera/ui/InLineSettingKnob.java b/src/com/android/camera/ui/InLineSettingKnob.java index 9bb771c..99a3b66 100644 --- a/src/com/android/camera/ui/InLineSettingKnob.java +++ b/src/com/android/camera/ui/InLineSettingKnob.java @@ -16,6 +16,7 @@ package com.android.camera.ui; +import com.android.camera.ListPreference; import com.android.camera.R; import android.content.Context; @@ -25,6 +26,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.View.OnTouchListener; +import android.view.accessibility.AccessibilityEvent; import android.widget.Button; import android.widget.TextView; @@ -100,6 +102,16 @@ public class InLineSettingKnob extends InLineSettingItem { mEntry = (TextView) findViewById(R.id.current_setting); } + @Override + public void initialize(ListPreference preference) { + super.initialize(preference); + // Add content descriptions for the increment and decrement buttons. + mNextButton.setContentDescription(getResources().getString( + R.string.accessibility_increment, mPreference.getTitle())); + mPrevButton.setContentDescription(getResources().getString( + R.string.accessibility_decrement, mPreference.getTitle())); + } + protected void updateView() { if (mOverrideValue == null) { mEntry.setText(mPreference.getEntry()); @@ -120,4 +132,15 @@ public class InLineSettingKnob extends InLineSettingItem { } } + @Override + public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { + onPopulateAccessibilityEvent(event); + return true; + } + + @Override + public void onPopulateAccessibilityEvent(AccessibilityEvent event) { + super.onPopulateAccessibilityEvent(event); + event.getText().add(mPreference.getTitle() + mPreference.getEntry()); + } } diff --git a/src/com/android/camera/ui/InLineSettingSwitch.java b/src/com/android/camera/ui/InLineSettingSwitch.java index 8663a05..8fc37da 100644 --- a/src/com/android/camera/ui/InLineSettingSwitch.java +++ b/src/com/android/camera/ui/InLineSettingSwitch.java @@ -16,11 +16,13 @@ package com.android.camera.ui; +import com.android.camera.ListPreference; import com.android.camera.R; import android.content.Context; import android.util.AttributeSet; import android.view.View; +import android.view.accessibility.AccessibilityEvent; import android.widget.Button; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -47,6 +49,14 @@ public class InLineSettingSwitch extends InLineSettingItem { mSwitch.setOnCheckedChangeListener(mCheckedChangeListener); } + @Override + public void initialize(ListPreference preference) { + super.initialize(preference); + // Add content descriptions for the increment and decrement buttons. + mSwitch.setContentDescription(getContext().getResources().getString( + R.string.accessibility_switch, mPreference.getTitle())); + } + protected void updateView() { if (mOverrideValue == null) { mSwitch.setChecked(mIndex == 1); @@ -55,4 +65,16 @@ public class InLineSettingSwitch extends InLineSettingItem { mSwitch.setChecked(index == 1); } } + + @Override + public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) { + onPopulateAccessibilityEvent(event); + return true; + } + + @Override + public void onPopulateAccessibilityEvent(AccessibilityEvent event) { + super.onPopulateAccessibilityEvent(event); + event.getText().add(mPreference.getTitle()); + } } diff --git a/src/com/android/camera/ui/IndicatorControl.java b/src/com/android/camera/ui/IndicatorControl.java index 03003d8..86b0cc9 100644 --- a/src/com/android/camera/ui/IndicatorControl.java +++ b/src/com/android/camera/ui/IndicatorControl.java @@ -125,6 +125,7 @@ public abstract class IndicatorControl extends RelativeLayout implements public IndicatorButton addIndicator(Context context, IconListPreference pref) { IndicatorButton b = new IndicatorButton(context, pref); b.setSettingChangedListener(this); + b.setContentDescription(pref.getTitle()); addView(b); mIndicators.add(b); return b; @@ -135,6 +136,8 @@ public abstract class IndicatorControl extends RelativeLayout implements OtherSettingIndicatorButton b = new OtherSettingIndicatorButton( context, resId, mPreferenceGroup, keys); b.setSettingChangedListener(this); + b.setContentDescription(getResources().getString( + R.string.pref_camera_settings_category)); addView(b); mIndicators.add(b); return b; diff --git a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java index 8fce8a7..c9037d9 100644 --- a/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java +++ b/src/com/android/camera/ui/SecondLevelIndicatorControlBar.java @@ -35,7 +35,7 @@ public class SecondLevelIndicatorControlBar extends IndicatorControl implements View.OnClickListener, AbstractIndicatorButton.IndicatorChangeListener { private static final String TAG = "SecondLevelIndicatorControlBar"; private static int ICON_SPACING = Util.dpToPixel(16); - private ImageView mCloseIcon; + private View mCloseIcon; private View mDivider; // the divider line private View mIndicatorHighlight; // the side highlight bar private View mPopupedIndicator; @@ -54,16 +54,13 @@ public class SecondLevelIndicatorControlBar extends IndicatorControl implements protected void onFinishInflate() { mDivider = findViewById(R.id.divider); mIndicatorHighlight = findViewById(R.id.indicator_highlight); + mCloseIcon = findViewById(R.id.back_to_first_level); + mCloseIcon.setOnClickListener(this); } public void initialize(Context context, PreferenceGroup group, String[] keys, String[] otherSettingKeys) { - if (mCloseIcon == null) { - mCloseIcon = new ColorFilterImageView(context); - mCloseIcon.setImageResource(R.drawable.btn_close_settings); - mCloseIcon.setOnClickListener(this); - addView(mCloseIcon); - } + setPreferenceGroup(group); mNonIndicatorButtonCount = getChildCount(); addControls(keys, otherSettingKeys); diff --git a/src/com/android/camera/ui/SharePopup.java b/src/com/android/camera/ui/SharePopup.java index 42b27d1..84bada4 100644 --- a/src/com/android/camera/ui/SharePopup.java +++ b/src/com/android/camera/ui/SharePopup.java @@ -68,6 +68,7 @@ public class SharePopup extends PopupWindow implements View.OnClickListener, private ListView mShareList; // A rotated view that contains the thumbnail. private RotateLayout mThumbnailRotateLayout; + private RotateLayout mGotoGalleryRotate; private View mPreviewFrame; private ArrayList<ComponentName> mComponent = new ArrayList<ComponentName>(); @@ -120,6 +121,9 @@ public class SharePopup extends PopupWindow implements View.OnClickListener, mShareView = (ViewGroup) sharePopup.findViewById(R.id.share_view); mShareView.setOnClickListener(this); + mGotoGalleryRotate =(RotateLayout) sharePopup.findViewById(R.id.goto_gallery_button_rotate); + sharePopup.findViewById(R.id.goto_gallery_button).setOnClickListener(this); + mBitmapWidth = bitmap.getWidth(); mBitmapHeight = bitmap.getHeight(); @@ -258,6 +262,8 @@ public class SharePopup extends PopupWindow implements View.OnClickListener, r.setOrientation(orientation); } + mGotoGalleryRotate.setOrientation(orientation); + adjustThumbnailPosition(); } @@ -271,6 +277,7 @@ public class SharePopup extends PopupWindow implements View.OnClickListener, @Override public void onClick(View v) { switch (v.getId()) { + case R.id.goto_gallery_button: case R.id.share_view: Util.viewUri(mUri, mContext); break; diff --git a/src/com/android/camera/ui/ZoomControl.java b/src/com/android/camera/ui/ZoomControl.java index 60964a4..1809d18 100644 --- a/src/com/android/camera/ui/ZoomControl.java +++ b/src/com/android/camera/ui/ZoomControl.java @@ -88,6 +88,13 @@ public abstract class ZoomControl extends RelativeLayout { protected ImageView addImageView(Context context, int iconResourceId) { ImageView image = new RotateImageView(context); image.setImageResource(iconResourceId); + if (iconResourceId == R.drawable.ic_zoom_slider) { + image.setContentDescription(getResources().getString( + R.string.accessibility_zoom_control)); + } else { + image.setContentDescription(getResources().getString( + R.string.empty)); + } addView(image); return image; } |
