Merge remote-tracking branch into merge_branch

Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
author: Santhosh Kumar H E <skhara@codeaurora.org> 2013-12-05 16:36:52 +0530
committer: Santhosh Kumar H E <skhara@codeaurora.org> 2013-12-06 18:58:24 +0530
commit: dbdb7620da136374eea95170261032f910015db0 (patch)
tree: 007242cdb44941ecb855751c85da69aa97cc6a43
parent: 1c7734057201ffd1b6d165d9e24793ef3d213043 (diff)
parent: df2b0819907c440a660e228414a18184732816d1 (diff)
download: android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.gz
android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.bz2
android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.zip
95 files changed, 1411 insertions, 475 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index daedbab3a..0a98e1622 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,6 +47,7 @@
         android:largeHeap="true"
         android:logo="@mipmap/ic_launcher_camera"
         android:restoreAnyVersion="true"
+        android:supportsRtl="true"
         android:theme="@style/Theme.Camera" >
         <activity
             android:name="com.android.camera.CameraActivity"
@@ -112,6 +113,7 @@
             android:excludeFromRecents="true"
             android:icon="@mipmap/ic_launcher_camera"
             android:label="@string/app_name"
+            android:logo="@mipmap/ic_launcher_gallery"
             android:taskAffinity="com.android.camera.SecureCameraActivity"
             android:theme="@style/Theme.Camera"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
diff --git a/res/drawable-hdpi/ic_notification.png b/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 000000000..2286682a9
--- /dev/null
+++ b/res/drawable-hdpi/ic_notification.png
diff --git a/res/drawable-mdpi/ic_notification.png b/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 000000000..497375030
--- /dev/null
+++ b/res/drawable-mdpi/ic_notification.png
diff --git a/res/drawable-xhdpi/ic_notification.png b/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 000000000..bf9861ab1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_notification.png
diff --git a/res/drawable-xxhdpi/ic_notification.png b/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 000000000..061c9cb0f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_notification.png
diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml
index 28b59c44d..5e073f43b 100644
--- a/res/layout-port/keyguard_widget.xml
+++ b/res/layout-port/keyguard_widget.xml
@@ -34,7 +34,7 @@
         android:layout_height="64dip"
         android:layout_toRightOf="@id/shutter"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="6dip"
+        android:layout_marginBottom="9dip"
         android:layout_marginRight="-5dip" />
 
     <ImageView
@@ -42,7 +42,7 @@
         style="@style/SwitcherButton"
         android:layout_toLeftOf="@id/shutter"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="2dip"
+        android:layout_marginBottom="3dip"
         android:scaleType="center"
         android:contentDescription="@string/accessibility_mode_picker"
         android:src="@drawable/ic_switch_camera" />
@@ -52,7 +52,7 @@
         style="@style/SwitcherButton"
         android:layout_toLeftOf="@id/shutter"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="2dip"
+        android:layout_marginBottom="3dip"
         android:scaleType="center"
         android:contentDescription="@string/accessibility_mode_picker"
         android:src="@drawable/ic_switcher_menu_indicator" />
diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml
index 5b049fe5e..1ad07aee9 100644
--- a/res/layout/filmstrip_bottom_controls.xml
+++ b/res/layout/filmstrip_bottom_controls.xml
@@ -30,6 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:background="@drawable/photopage_bottom_button_background"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
@@ -55,6 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:background="@drawable/photopage_bottom_button_background"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml
index 0b2785a3e..581170f07 100644
--- a/res/layout/panorama_module.xml
+++ b/res/layout/panorama_module.xml
@@ -19,6 +19,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <include layout="@layout/pano_module_capture" />
+    <View
+        android:id="@+id/preview_cover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        android:visibility="gone" />
     <include layout="@layout/pano_module_review" />
     <include layout="@layout/camera_controls"
              android:layout_gravity="center"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index b1c5cdfd8..5d00da102 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -96,6 +96,12 @@
                 </TableRow>
             </TableLayout>
         </RelativeLayout>
+        <View
+            android:id="@+id/preview_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            android:visibility="gone" />
     <ImageView
         android:id="@+id/review_image"
         android:layout_width="match_parent"
diff --git a/res/layout/placeholder_progressbar.xml b/res/layout/placeholder_progressbar.xml
new file mode 100644
index 000000000..45eadfbe0
--- /dev/null
+++ b/res/layout/placeholder_progressbar.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013 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.
+-->
+
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/placeholder_progress"
+        style="@android:style/Widget.Holo.ProgressBar.Large"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:paddingBottom="58dp"
+        android:visibility="visible"
+        android:indeterminate="true"
+        android:indeterminateOnly="true"
+        android:background="@null"/>
+
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index b4444e7f0..198be8913 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -26,6 +26,12 @@
             android:id="@+id/preview_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+        <View
+            android:id="@+id/preview_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            android:visibility="gone" />
     </FrameLayout>
     <View
         android:id="@+id/flash_overlay"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d6ef20793..381c6f88a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Berei tans SD-kaart voor…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Kon nie toegang tot SD-kaart kry nie."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Tydsverloop-opname"</string>
+    <string name="capturing" msgid="5255164204641920893">"Vang tans vas"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Kies kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Terug"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Voorkant"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pieksels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pieksels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pieksels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M pieksels"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 M pieksels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M pieksels"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Outo"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Skakel HDR+ aan"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Skakel HDR+ af"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Skakel HDR aan"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Skakel HDR af"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ AAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ AF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR AAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR AF"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Handeling"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nag"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sonsondergang"</string>
@@ -289,5 +291,5 @@
     <string name="crop_save" msgid="2841974981340098579">"Stoor"</string>
     <string name="cannot_load_image" msgid="4100136187076585580">"Kan nie die prent laai nie!"</string>
     <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrook-aansig"</string>
-    <string name="setting_wallpaper" msgid="2397759659347872725">"Stel muurpapier in"</string>
+    <string name="setting_wallpaper" msgid="2397759659347872725">"Stel tans muurpapier in"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1cbc2d96c..bd1655dc2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"የSD ካርድ በማዘጋጀት ላይ…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD ካርድን መድረስ አልተቻለም።"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"በቀረጻ የአላፊ ጊዜ"</string>
+    <string name="capturing" msgid="5255164204641920893">"በመቅረጽ ላይ"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"ካሜራ ይምረጡ"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"የኋላ"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"የፊት"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2ሚ ፒክሰሎች (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1ሚ ፒክሰሎች"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ራስ-ሰር"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"ኤች ዲ አር+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"ኤች ዲ አር"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"ኤች ዲ አር+ አብራ"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"ኤች ዲ አር+ አጥፋ"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"ኤች ዲ አር አብራ"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"ኤች ዲ አር አጥፋ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"ኤች ዲ አር+ በርቷል"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"ኤች ዲ አር+ ጠፍቷል"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"ኤች ዲ አር በርቷል"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"ኤች ዲ አር ጠፍቷል"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"እርምጃ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ሌሊት"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ፀሀይ ስትጠልቅ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index db3e3d9db..364d79686 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -34,19 +34,19 @@
     <string name="details" msgid="4404020741542549488">"التفاصيل"</string>
     <string name="close" msgid="4826166926297479820">"إغلاق"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9217673864242686656">"تم تحديد %1$d"</item>
-    <item quantity="one" msgid="5806616411905812727">"تم تحديد %1$d"</item>
-    <item quantity="other" msgid="3767743589502328221">"تم تحديد %1$d"</item>
+    <item quantity="zero" msgid="9217673864242686656">"‏تم تحديد %1$d"</item>
+    <item quantity="one" msgid="5806616411905812727">"‏تم تحديد %1$d"</item>
+    <item quantity="other" msgid="3767743589502328221">"‏تم تحديد %1$d"</item>
   </plurals>
   <plurals name="number_of_albums_selected">
-    <item quantity="zero" msgid="8095100906728830821">"تم تحديد %1$d"</item>
-    <item quantity="one" msgid="9063509704521984072">"تم تحديد %1$d"</item>
-    <item quantity="other" msgid="135044054552480485">"تم تحديد %1$d"</item>
+    <item quantity="zero" msgid="8095100906728830821">"‏تم تحديد %1$d"</item>
+    <item quantity="one" msgid="9063509704521984072">"‏تم تحديد %1$d"</item>
+    <item quantity="other" msgid="135044054552480485">"‏تم تحديد %1$d"</item>
   </plurals>
   <plurals name="number_of_groups_selected">
-    <item quantity="zero" msgid="1942343672734097509">"تم تحديد %1$d"</item>
-    <item quantity="one" msgid="1456436514367094505">"تم تحديد %1$d"</item>
-    <item quantity="other" msgid="1511467088339194694">"تم تحديد %1$d"</item>
+    <item quantity="zero" msgid="1942343672734097509">"‏تم تحديد %1$d"</item>
+    <item quantity="one" msgid="1456436514367094505">"‏تم تحديد %1$d"</item>
+    <item quantity="other" msgid="1511467088339194694">"‏تم تحديد %1$d"</item>
   </plurals>
     <string name="show_on_map" msgid="8542853913632649160">"عرض على الخريطة"</string>
     <string name="rotate_left" msgid="2618440058490662604">"تدوير لليسار"</string>
@@ -66,7 +66,7 @@
     <string name="height" msgid="5186001199353423689">"الارتفاع"</string>
     <string name="orientation" msgid="3883761294106680270">"الاتجاه"</string>
     <string name="duration" msgid="5316211067383665008">"المدة"</string>
-    <string name="mimetype" msgid="6415940055077963944">"نوع MIME"</string>
+    <string name="mimetype" msgid="6415940055077963944">"‏نوع MIME"</string>
     <string name="file_size" msgid="6841070748357980676">"حجم الملف"</string>
     <string name="maker" msgid="698691509121545856">"منشئ العنصر"</string>
     <string name="model" msgid="8547493604023069452">"النموذج"</string>
@@ -89,10 +89,11 @@
     <string name="cannot_connect_camera" msgid="4311259792784598381">"يتعذر الاتصال بالكاميرا."</string>
     <string name="camera_disabled" msgid="6963443549010040595">"تم تعطيل الكاميرا بسبب سياسات الأمان."</string>
     <string name="wait" msgid="765601745709933047">"الرجاء الانتظار…"</string>
-    <string name="no_storage" product="default" msgid="5922012950780548098">"أدرج بطاقة SD قبل استخدام الكاميرا."</string>
-    <string name="preparing_sd" product="default" msgid="7435693655017362767">"جارٍ تحضير بطاقة SD…"</string>
-    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"تعذر الدخول إلى بطاقة SD."</string>
+    <string name="no_storage" product="default" msgid="5922012950780548098">"‏أدرج بطاقة SD قبل استخدام الكاميرا."</string>
+    <string name="preparing_sd" product="default" msgid="7435693655017362767">"‏جارٍ تحضير بطاقة SD…"</string>
+    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"‏تعذر الدخول إلى بطاقة SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"التسجيل في وضع انقضاء الوقت"</string>
+    <string name="capturing" msgid="5255164204641920893">"جارٍ الالتقاط"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"اختيار كاميرا"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"الخلفية"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"الأمامية"</string>
@@ -101,7 +102,7 @@
     <string name="pref_camera_timer_title" msgid="4728838281741571323">"موقّت العد التنازلي"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="8919878087230098328">"ثانية واحدة"</item>
-    <item quantity="other" msgid="5782794798884172289">"%d من الثواني"</item>
+    <item quantity="other" msgid="5782794798884172289">"‏%d من الثواني"</item>
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
     <skip />
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ميغا بكسل (16‏:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 ميغا بكسل"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"تلقائيًا"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"نطاق عالي الديناميكية+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"نطاق عالي الديناميكية"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"تشغيل النطاق عالي الديناميكية الأفضل"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"إيقاف النطاق عالي الديناميكية الأفضل"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"تشغيل النطاق عالي الديناميكية"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"إيقاف النطاق عالي الديناميكية"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"تشغيل النطاق عالي الديناميكية+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"إيقاف النطاق عالي الديناميكية+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"تشغيل النطاق عالي الديناميكية"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"إيقاف النطاق عالي الديناميكية"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"حركة"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ليلاً"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"الغروب"</string>
@@ -186,7 +188,7 @@
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"الكاميرا الأمامية"</string>
     <string name="pref_camera_id_label_front" msgid="349308803062874842">"الكاميرا الخلفية"</string>
     <string name="dialog_ok" msgid="774141340500181131">"موافق"</string>
-    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"أوشكت المساحة الخالية في بطاقة SD على النفاد. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى."</string>
+    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"‏أوشكت المساحة الخالية في بطاقة SD على النفاد. غيّر إعداد الجودة أو احذف بعض الصور أو الملفات الأخرى."</string>
     <string name="video_reach_size_limit" msgid="9196836111505731836">"تم بلوغ الحد الأقصى للحجم."</string>
     <string name="pano_too_fast_prompt" msgid="2503148095578052177">"سريع جدًا"</string>
     <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"جارٍ تحضير الصورة البانورامية"</string>
@@ -217,7 +219,7 @@
     <string name="accessibility_shutter_button" msgid="6040483605347230438">"الغالق"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"زر القائمة"</string>
     <string name="accessibility_mode_picker" msgid="5107120667206453381">"محدّد الكاميرا أو الفيديو أو البانوراما"</string>
-    <string name="accessibility_check_box" msgid="1084094675439953723">"مربع اختيار %1$s"</string>
+    <string name="accessibility_check_box" msgid="1084094675439953723">"‏مربع اختيار %1$s"</string>
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"تبديل إلى وضع الصور"</string>
     <string name="accessibility_switch_to_video" msgid="8174781871592793967">"تبديل إلى وضع الفيديو"</string>
     <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"تبديل إلى بانوراما"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ad99c7cf1..c195059db 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD картата се подготвя…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Няма достъп до SD картата."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Запис на цайтрафера"</string>
+    <string name="capturing" msgid="5255164204641920893">"Заснема се"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Избиране на камера"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Задна"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Предна"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 мегапиксела (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 мегапиксел"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Автоматично"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Включване на HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Изключване на HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Включване на HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Изключване на HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"ВКЛЮЧВАНЕ НА HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"ИЗКЛЮЧВАНЕ НА HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"ВКЛЮЧВАНЕ НА HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"ИЗКЛЮЧВАНЕ НА HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Действие"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"През нощта"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Залез"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1cccc3c1a..60bed2524 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"S\'està preparant la targeta SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"No s\'ha pogut accedir a la targeta SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Enregistrament a intervals"</string>
+    <string name="capturing" msgid="5255164204641920893">"S\'està capturant."</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Tria de la càmera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Enrere"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontal"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mp"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mp"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mp (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Mp"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mp"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mp"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activa l\'HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desactiva l\'HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activa l\'HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desactiva l\'HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ACTIVAT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DESACTIVAT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ACTIVAT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DESACTIVAT"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acció"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Posta de sol"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e6d94363f..15ab0aa5e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Příprava karty SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nelze získat přístup ke kartě SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Časosběrný záznam"</string>
+    <string name="capturing" msgid="5255164204641920893">"Pořizování snímku"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Zvolit fotoaparát"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Zpět"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Přední"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpx"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpx (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Mpx"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpx"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaticky"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Zapnout HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Vypnout HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Zapnout HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Vypnout HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ZAPNUTO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ VYPNUTO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ZAPNUTO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR VYPNUTO"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akce"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Západ slunce"</string>
@@ -226,8 +228,8 @@
     <string name="accessibility_review_cancel" msgid="5462850829869569629">"Zrušit"</string>
     <string name="accessibility_review_ok" msgid="3486465319880320270">"Hotovo"</string>
     <string name="accessibility_review_retake" msgid="2547112860787022130">"Pořídit další"</string>
-    <string name="capital_on" msgid="1118214824959797269">"Zap."</string>
-    <string name="capital_off" msgid="3020696135020167263">"Vyp."</string>
+    <string name="capital_on" msgid="1118214824959797269">"ZAP."</string>
+    <string name="capital_off" msgid="3020696135020167263">"VYP"</string>
     <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Vypnuto"</string>
     <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0,5 sekundy"</string>
     <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 sekunda"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 3edce31ed..f35e546be 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Forbereder SD-kort.."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Det var ikke muligt at få adgang til SD-kortet."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Optagelse af tidsforløb"</string>
+    <string name="capturing" msgid="5255164204641920893">"Fotograferer"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Vælg kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Tilbage"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Front"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixels"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisk"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Slå HDR+ til"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Slå HDR+ fra"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Slå HDR til"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Slå HDR fra"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ TIL"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ FRA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR TIL"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR FRA"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nat"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Solnedgang"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 19c2381d6..fc721a0ec 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD-Karte wird vorbereitet…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Kein Zugriff auf SD-Karte möglich"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Zeitrafferaufnahme"</string>
+    <string name="capturing" msgid="5255164204641920893">"Wird aufgenommen"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Kamera wählen"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Zurück"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Vorderseite"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Megapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisch"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ aktivieren"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ deaktivieren"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR aktivieren"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR deaktivieren"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ an"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ aus"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR an"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR aus"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Bewegung"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nachtaufnahme"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sonnenuntergang"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0c4d771d2..25f78a3bb 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Προετοιμασία κάρτας SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Δεν ήταν δυνατή η πρόσβαση στην κάρτα SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Εγγραφή παρέλευσης χρόνου"</string>
+    <string name="capturing" msgid="5255164204641920893">"Λήψη"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Επιλογή φωτ. μηχανής"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Πίσω"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Μπροστινή"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M εικονοστοιχεία"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M εικονοστοιχεία"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M εικονοστ. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M pixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M εικονοστοιχεία"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M εικονοστοιχεία"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Αυτόματα"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ενεργοποίηση του Υψηλού δυναμικού εύρους+ (HDR)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Απενεργοποίηση του Υψηλού δυναμικού εύρους+ (HDR)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ενεργοποίηση του Υψηλού δυναμικού εύρους (HDR)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Απενεργοποίηση του Υψηλού δυναμικού εύρους (HDR)"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"ΕΝΕΡΓΟΠΟΙΗΣΗ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"ΕΝΕΡΓΟΠΟΙΗΣΗ HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"ΑΠΕΝΕΡΓΟΠΟΙΗΣΗ HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ενέργεια"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Βράδυ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Ηλιοβασίλεμα"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c8d07eb21..cfd3f38fd 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparing SD card…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Couldn\'t access SD card."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Time lapse recording"</string>
+    <string name="capturing" msgid="5255164204641920893">"Capturing"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Choose camera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Back"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Front"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pixels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 M pixels"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M pixels"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Turn HDR+ On"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Turn HDR+ Off"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Turn HDR On"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Turn HDR Off"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ON"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ OFF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ON"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR OFF"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sunset"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c8d07eb21..cfd3f38fd 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparing SD card…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Couldn\'t access SD card."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Time lapse recording"</string>
+    <string name="capturing" msgid="5255164204641920893">"Capturing"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Choose camera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Back"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Front"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pixels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pixels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 M pixels"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 M pixels"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M pixels"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Turn HDR+ On"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Turn HDR+ Off"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Turn HDR On"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Turn HDR Off"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ON"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ OFF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ON"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR OFF"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sunset"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 85a7d5f61..31a4e2eed 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparando tarjeta SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"No se pudo acceder a la tarjeta SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Grabación en intervalos"</string>
+    <string name="capturing" msgid="5255164204641920893">"Capturando"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Elegir cámara"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Trasera"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontal"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapíxeles"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapíxeles"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapíxeles (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 MP"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapíxeles"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapíxel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desactivar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activar HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desactivar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ACTIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DESACTIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ACTIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DESACTIVADO"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acción"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noche"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Atardecer"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0c3333ebc..9e2b659dc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparando tarjeta SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"No se ha podido acceder a la tarjeta SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Grabación a intervalos de tiempo"</string>
+    <string name="capturing" msgid="5255164204641920893">"Capturando"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Seleccionar cámara"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Atrás"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontal"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 MP"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"ARD"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desactivar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activar HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desactivar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ACTIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DESACTIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ACTIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DESACTIVADO"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acción"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noche"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Atardecer"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 7b841ae6f..88611e4c1 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD-kaardi ettevalmistamine ..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD-kaardile ei saanud juurdepääsu."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Aeglustusrežiimis salvestamine"</string>
+    <string name="capturing" msgid="5255164204641920893">"Pildistamine"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Kaamera valimine"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Tagasi"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Esikaamera"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16 : 9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikslit"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaatne"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ sisselülitamine"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ väljalülitamine"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR-i sisselülitamine"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR-i väljalülitamine"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ON SEES"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ ON VÄLJAS"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ON SEES"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR ON VÄLJAS"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Toiming"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Õhtu"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Päikeseloojang"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 00cd0f8ca..e457bf752 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -34,19 +34,19 @@
     <string name="details" msgid="4404020741542549488">"جزئیات"</string>
     <string name="close" msgid="4826166926297479820">"بستن"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9217673864242686656">"%1$d انتخاب شد"</item>
-    <item quantity="one" msgid="5806616411905812727">"%1$d انتخاب شد"</item>
-    <item quantity="other" msgid="3767743589502328221">"%1$d انتخاب شد"</item>
+    <item quantity="zero" msgid="9217673864242686656">"‏%1$d انتخاب شد"</item>
+    <item quantity="one" msgid="5806616411905812727">"‏%1$d انتخاب شد"</item>
+    <item quantity="other" msgid="3767743589502328221">"‏%1$d انتخاب شد"</item>
   </plurals>
   <plurals name="number_of_albums_selected">
-    <item quantity="zero" msgid="8095100906728830821">"%1$d انتخاب شد"</item>
-    <item quantity="one" msgid="9063509704521984072">"%1$d انتخاب شد"</item>
-    <item quantity="other" msgid="135044054552480485">"%1$d انتخاب شد"</item>
+    <item quantity="zero" msgid="8095100906728830821">"‏%1$d انتخاب شد"</item>
+    <item quantity="one" msgid="9063509704521984072">"‏%1$d انتخاب شد"</item>
+    <item quantity="other" msgid="135044054552480485">"‏%1$d انتخاب شد"</item>
   </plurals>
   <plurals name="number_of_groups_selected">
-    <item quantity="zero" msgid="1942343672734097509">"%1$d انتخاب شد"</item>
-    <item quantity="one" msgid="1456436514367094505">"%1$d انتخاب شد"</item>
-    <item quantity="other" msgid="1511467088339194694">"%1$d انتخاب شد"</item>
+    <item quantity="zero" msgid="1942343672734097509">"‏%1$d انتخاب شد"</item>
+    <item quantity="one" msgid="1456436514367094505">"‏%1$d انتخاب شد"</item>
+    <item quantity="other" msgid="1511467088339194694">"‏%1$d انتخاب شد"</item>
   </plurals>
     <string name="show_on_map" msgid="8542853913632649160">"نمایش در نقشه"</string>
     <string name="rotate_left" msgid="2618440058490662604">"چرخش به چپ"</string>
@@ -66,7 +66,7 @@
     <string name="height" msgid="5186001199353423689">"ارتفاع"</string>
     <string name="orientation" msgid="3883761294106680270">"جهت"</string>
     <string name="duration" msgid="5316211067383665008">"مدت"</string>
-    <string name="mimetype" msgid="6415940055077963944">"نوع MIME"</string>
+    <string name="mimetype" msgid="6415940055077963944">"‏نوع MIME"</string>
     <string name="file_size" msgid="6841070748357980676">"حجم فایل"</string>
     <string name="maker" msgid="698691509121545856">"سازنده"</string>
     <string name="model" msgid="8547493604023069452">"مدل"</string>
@@ -84,15 +84,16 @@
     <string name="unknown" msgid="564184550182858146">"نامشخص"</string>
     <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"این مورد در دستگاه ذخیره شده و به صورت آفلاین در دسترس است."</string>
     <string name="please_wait" msgid="1416313324505140068">"لطفاً منتظر بمانید"</string>
-    <string name="rendering_photo_sphere" msgid="3032858512989313215">"در حال تولید تصویر Photo Sphere"</string>
+    <string name="rendering_photo_sphere" msgid="3032858512989313215">"‏در حال تولید تصویر Photo Sphere"</string>
     <string name="camera_error_title" msgid="6200558085072670067">"خطای دوربین"</string>
     <string name="cannot_connect_camera" msgid="4311259792784598381">"اتصال به دوربین امکان‌پذیر نیست."</string>
     <string name="camera_disabled" msgid="6963443549010040595">"به دلیل خط‌مشی‌های امنیتی، دوربین غیرفعال شده است."</string>
     <string name="wait" msgid="765601745709933047">"لطفاً منتظر بمانید…"</string>
-    <string name="no_storage" product="default" msgid="5922012950780548098">"قبل از استفاده از دوربین، یک کارت SD در آن قرار دهید."</string>
-    <string name="preparing_sd" product="default" msgid="7435693655017362767">"در حال آماده‌سازی کارت SD..."</string>
-    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"دسترسی به کارت SD ممکن نیست."</string>
+    <string name="no_storage" product="default" msgid="5922012950780548098">"‏قبل از استفاده از دوربین، یک کارت SD در آن قرار دهید."</string>
+    <string name="preparing_sd" product="default" msgid="7435693655017362767">"‏در حال آماده‌سازی کارت SD..."</string>
+    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"‏دسترسی به کارت SD ممکن نیست."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"ضبط با قابلیت گذر زمان"</string>
+    <string name="capturing" msgid="5255164204641920893">"درحال ضبط"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"انتخاب دوربین"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"برگشت"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"جلو"</string>
@@ -101,7 +102,7 @@
     <string name="pref_camera_timer_title" msgid="4728838281741571323">"تایمر شمارش معکوس"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="8919878087230098328">"۱ ثانیه"</item>
-    <item quantity="other" msgid="5782794798884172289">"%d ثانیه"</item>
+    <item quantity="other" msgid="5782794798884172289">"‏%d ثانیه"</item>
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
     <skip />
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"۳ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"۲ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"‫۲ مگاپیکسل (۱۶:۹)‏"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"‫۱٫۵ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"۱٫۳ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"۱ مگاپیکسل"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"خودکار"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+‎"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"روشن کردن HDR+‎"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"خاموش کردن HDR+‎"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"روشن کردن HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"خاموش کردن HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"‏HDR+‎ روشن"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"‏HDR+‎ خاموش"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"‏‫HDR روشن"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"‏‫HDR خاموش"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"عملکرد"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"شب"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"غروب آفتاب"</string>
@@ -186,7 +188,7 @@
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"دوربین جلو"</string>
     <string name="pref_camera_id_label_front" msgid="349308803062874842">"دوربین پشت"</string>
     <string name="dialog_ok" msgid="774141340500181131">"تأیید"</string>
-    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"کارت SD شما پر شده است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا فایل‌های دیگر را حذف کنید."</string>
+    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"‏کارت SD شما پر شده است. تنظیمات کیفیت را تغییر دهید یا برخی تصاویر یا فایل‌های دیگر را حذف کنید."</string>
     <string name="video_reach_size_limit" msgid="9196836111505731836">"حجم ویدیو به حداکثر مجاز رسید."</string>
     <string name="pano_too_fast_prompt" msgid="2503148095578052177">"بسیار سریع"</string>
     <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"در حال آماده‌سازی پانوراما"</string>
@@ -217,11 +219,11 @@
     <string name="accessibility_shutter_button" msgid="6040483605347230438">"شاتر"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"دکمه منو"</string>
     <string name="accessibility_mode_picker" msgid="5107120667206453381">"انتخابگر دوربین، ویدیو یا پانوراما"</string>
-    <string name="accessibility_check_box" msgid="1084094675439953723">"کادر تأیید %1$s"</string>
+    <string name="accessibility_check_box" msgid="1084094675439953723">"‏کادر تأیید %1$s"</string>
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"تغییر به حالت عکس"</string>
     <string name="accessibility_switch_to_video" msgid="8174781871592793967">"تغییر به حالت ویدیو"</string>
     <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"تغییر به حالت پانوراما"</string>
-    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"تغییر به Photo Sphere"</string>
+    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"‏تغییر به Photo Sphere"</string>
     <string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"تغییر به کیفیت بالا"</string>
     <string name="accessibility_review_cancel" msgid="5462850829869569629">"لغو بازبینی"</string>
     <string name="accessibility_review_ok" msgid="3486465319880320270">"بازبینی انجام شد"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5dc4183cb..2e40945cb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Valmistellaan SD-korttia…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD-korttia ei voi käyttää."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Intervallikuvauksen tallennus"</string>
+    <string name="capturing" msgid="5255164204641920893">"Kuvataan"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Valitse kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Edellinen"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Etupuoli"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megap. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikseliä"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapikseli"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ota HDR+ käyttöön"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Poista HDR+ käytöstä"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ota HDR käyttöön"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Poista HDR käytöstä"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ KÄYTÖSSÄ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ EI KÄYTÖSSÄ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR KÄYTÖSSÄ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR EI KÄYTÖSSÄ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Toiminto"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Yö"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Auringonlasku"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9ff83bbf7..315ee656e 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Préparation de la carte SD en cours…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Impossible d\'accéder à la carte SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Enregistr. mode Intervalle temps"</string>
+    <string name="capturing" msgid="5255164204641920893">"Photo en cours…"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Sélectionner appareil"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Précédent"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontal"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 mégapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 mégapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mégapixels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mégapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 mégapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 mégapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatique"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activer le mode HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Désactiver le mode HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activer le mode HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Désactiver le mode HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ACTIVÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DÉSACTIVÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ACTIVÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DÉSACTIVÉ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nuit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"C. de soleil"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4cd432c07..fc2c76935 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Préparation de la carte SD en cours…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Impossible d\'accéder à la carte SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Enregistrement mode Intervalle temps"</string>
+    <string name="capturing" msgid="5255164204641920893">"Prise de vue en cours…"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Sélectionner caméra"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Arrière"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontale"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 mégapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 mégapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mégapixels (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mégapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 mégapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 mégapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatique"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activer le mode HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Désactiver le mode HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activer le mode HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Désactiver le mode HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ACTIVÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DÉSACTIVÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ACTIVÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DÉSACTIVÉ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nuit"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Coucher de soleil"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 830adca12..1acbdfbff 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD कार्ड तैयार हो रहा है…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD कार्ड एक्सेस नहीं कर सका."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"समय अंतराल रिकॉर्डिंग"</string>
+    <string name="capturing" msgid="5255164204641920893">"कैप्चर हो रहा है"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"कैमरा चुनें"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"पीछे का कैमरा"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"सामने का कैमरा"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M पिक्सेल (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M पिक्सेल"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"स्वतः"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ चालू करें"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ बंद करें"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR चालू करें"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR बंद करें"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ चालू"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ बंद"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR चालू"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR बंद"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"कार्यवाही"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"रात"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"सूर्यास्त"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 22b5759e5..cb4d20367 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Priprema SD kartice…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nije moguć pristup SD kartici."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Snimanje s vremenskim odmakom"</string>
+    <string name="capturing" msgid="5255164204641920893">"Snimanje"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Odaberite fotoaparat"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Stražnji"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Prednji"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mpiks. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapiksela"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatski"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"VDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"VDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Uključi VDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Isključi VDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Uključi VDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Isključi VDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR UKLJUČEN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ ISKLJUČEN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"VDR UKLJUČEN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"VDR ISKLJUČEN"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Radnja"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noć"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zalazak sunca"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0384019b0..bc27b2e52 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD-kártya előkészítése..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nem lehet hozzáférni az SD-kártyához."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Gyorsított felvétel"</string>
+    <string name="capturing" msgid="5255164204641920893">"Rögzítés"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Kameraválasztás"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Hátsó"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Elülső"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatikus"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ bekapcsolása"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ kikapcsolása"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR bekapcsolása"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR kikapcsolása"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ BEKAPCSOLVA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ KIKAPCSOLVA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR BEKAPCSOLVA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR KIKAPCSOLVA"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Mozgásban"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Éjszaka"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Napnyugta"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 0e4f67bbc..3603d6a58 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Պատրաստվում է SD քարտը..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD քարտը հասանելի չէ:"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Ժամանակի սպառումով տեսագրություն"</string>
+    <string name="capturing" msgid="5255164204641920893">"Լուսանկարում"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Ընտրել տեսախցիկը"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Հետևի"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Առջևի"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3Մ պիքսել"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2Մ պիքսել"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2Մ պիքսել (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5Մ պիքսել"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3Մ պիքսել"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1Մ պիքսել"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Ավտոմատ"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Միացնել HDR+ը"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Անջատել HDR+ը"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Միացնել HDR-ը"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Անջատել HDR-ը"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ Միացնել"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ Անջատել"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR Միացնել"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR Անջատել"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Գործողություն"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Գիշերային"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Մայրամուտ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b42624941..115f90175 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Menyiapkan kartu SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Tidak dapat mengakses kartu SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Perekaman selang waktu"</string>
+    <string name="capturing" msgid="5255164204641920893">"Menjepret"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Pilih kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Kembali"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Depan"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M px (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5M piksel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 M piksel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M piksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Otomatis"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Aktifkan HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Nonaktifkan HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Aktifkan HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Nonaktifkan HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ AKTIF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ NONAKTIF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR AKTIF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR NONAKTIF"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tindakan"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Malam"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Terbenam"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b5dcf6323..b9ba5e636 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparazione scheda SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Accesso a scheda SD non riuscito."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Registrazione al rallentatore"</string>
+    <string name="capturing" msgid="5255164204641920893">"Acquisizione..."</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Scegli fotocamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Posteriore"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Anteriore"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpixel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpixel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatica"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Attiva HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Disattiva HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Attiva HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Disattiva HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ATTIVO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DISATTIVATO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ATTIVO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DISATTIVATO"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Azione"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Notte"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Tramonto"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 27601f17d..3d6d04d08 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -34,19 +34,19 @@
     <string name="details" msgid="4404020741542549488">"פרטים"</string>
     <string name="close" msgid="4826166926297479820">"סגור"</string>
   <plurals name="number_of_items_selected">
-    <item quantity="zero" msgid="9217673864242686656">"%1$d נבחרו"</item>
-    <item quantity="one" msgid="5806616411905812727">"%1$d נבחרו"</item>
-    <item quantity="other" msgid="3767743589502328221">"%1$d נבחרו"</item>
+    <item quantity="zero" msgid="9217673864242686656">"‏%1$d נבחרו"</item>
+    <item quantity="one" msgid="5806616411905812727">"‏%1$d נבחרו"</item>
+    <item quantity="other" msgid="3767743589502328221">"‏%1$d נבחרו"</item>
   </plurals>
   <plurals name="number_of_albums_selected">
-    <item quantity="zero" msgid="8095100906728830821">"%1$d נבחרו"</item>
-    <item quantity="one" msgid="9063509704521984072">"%1$d נבחרו"</item>
-    <item quantity="other" msgid="135044054552480485">"%1$d נבחרו"</item>
+    <item quantity="zero" msgid="8095100906728830821">"‏%1$d נבחרו"</item>
+    <item quantity="one" msgid="9063509704521984072">"‏%1$d נבחרו"</item>
+    <item quantity="other" msgid="135044054552480485">"‏%1$d נבחרו"</item>
   </plurals>
   <plurals name="number_of_groups_selected">
-    <item quantity="zero" msgid="1942343672734097509">"%1$d נבחרו"</item>
-    <item quantity="one" msgid="1456436514367094505">"%1$d נבחרו"</item>
-    <item quantity="other" msgid="1511467088339194694">"%1$d נבחרו"</item>
+    <item quantity="zero" msgid="1942343672734097509">"‏%1$d נבחרו"</item>
+    <item quantity="one" msgid="1456436514367094505">"‏%1$d נבחרו"</item>
+    <item quantity="other" msgid="1511467088339194694">"‏%1$d נבחרו"</item>
   </plurals>
     <string name="show_on_map" msgid="8542853913632649160">"הצג במפה"</string>
     <string name="rotate_left" msgid="2618440058490662604">"סובב שמאלה"</string>
@@ -66,7 +66,7 @@
     <string name="height" msgid="5186001199353423689">"גובה"</string>
     <string name="orientation" msgid="3883761294106680270">"כיוון"</string>
     <string name="duration" msgid="5316211067383665008">"משך זמן"</string>
-    <string name="mimetype" msgid="6415940055077963944">"סוג MIME"</string>
+    <string name="mimetype" msgid="6415940055077963944">"‏סוג MIME"</string>
     <string name="file_size" msgid="6841070748357980676">"גודל קובץ"</string>
     <string name="maker" msgid="698691509121545856">"יוצר"</string>
     <string name="model" msgid="8547493604023069452">"דגם"</string>
@@ -75,7 +75,7 @@
     <string name="focal_length" msgid="8351221512187346229">"רוחק מוקד"</string>
     <string name="white_balance" msgid="1600142743496129085">"איזון לבן"</string>
     <string name="exposure_time" msgid="949787291620767754">"זמן חשיפה"</string>
-    <string name="iso" msgid="8578773821062054902">"ISO‏"</string>
+    <string name="iso" msgid="8578773821062054902">"‏ISO‏"</string>
     <string name="unit_mm" msgid="5210344300697638286">"מ\"מ"</string>
     <string name="manual" msgid="2444400953521760140">"ידני"</string>
     <string name="auto" msgid="2552649885114400474">"אוטומטי"</string>
@@ -84,15 +84,16 @@
     <string name="unknown" msgid="564184550182858146">"לא ידוע"</string>
     <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"הפריט מאוחסן באופן מקומי וזמין במצב לא מקוון."</string>
     <string name="please_wait" msgid="1416313324505140068">"המתן"</string>
-    <string name="rendering_photo_sphere" msgid="3032858512989313215">"מעבד את צילום ה-Photo Sphere"</string>
+    <string name="rendering_photo_sphere" msgid="3032858512989313215">"‏מעבד את צילום ה-Photo Sphere"</string>
     <string name="camera_error_title" msgid="6200558085072670067">"שגיאת מצלמה"</string>
     <string name="cannot_connect_camera" msgid="4311259792784598381">"לא ניתן להתחבר למצלמה."</string>
     <string name="camera_disabled" msgid="6963443549010040595">"המצלמה הושבתה בשל מדיניות אבטחה."</string>
     <string name="wait" msgid="765601745709933047">"המתן…"</string>
-    <string name="no_storage" product="default" msgid="5922012950780548098">"הכנס כרטיס SD לפני השימוש במצלמה."</string>
-    <string name="preparing_sd" product="default" msgid="7435693655017362767">"מכין כרטיס SD…"</string>
-    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"לא ניתן היה לגשת לכרטיס ה-SD."</string>
+    <string name="no_storage" product="default" msgid="5922012950780548098">"‏הכנס כרטיס SD לפני השימוש במצלמה."</string>
+    <string name="preparing_sd" product="default" msgid="7435693655017362767">"‏מכין כרטיס SD…"</string>
+    <string name="access_sd_fail" product="default" msgid="2634861611082499811">"‏לא ניתן היה לגשת לכרטיס ה-SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"הקלטה של צילום בהילוך מהיר"</string>
+    <string name="capturing" msgid="5255164204641920893">"מצלם"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"בחר מצלמה"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"הקודם"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"חזיתית"</string>
@@ -101,7 +102,7 @@
     <string name="pref_camera_timer_title" msgid="4728838281741571323">"טיימר לספירה לאחור"</string>
   <plurals name="pref_camera_timer_entry">
     <item quantity="one" msgid="8919878087230098328">"שנייה אחת"</item>
-    <item quantity="other" msgid="5782794798884172289">"%d שניות"</item>
+    <item quantity="other" msgid="5782794798884172289">"‏%d שניות"</item>
   </plurals>
     <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
     <skip />
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 מגה פיקסל (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 מגה פיקסל"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"מגה פיקסל אחד"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"אוטומטי"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+‎"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"הפעל HDR+‎"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"כבה HDR+‎"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"הפעל HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"כבה HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"‏HDR+‎ פועל"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"‏HDR+‎ כבוי"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"‏HDR פועל"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"‏HDR כבוי"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"פעולה"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"לילה"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"שקיעה"</string>
@@ -186,7 +188,7 @@
     <string name="pref_camera_id_label_back" msgid="1645608049757733858">"מצלמה חזיתית"</string>
     <string name="pref_camera_id_label_front" msgid="349308803062874842">"מצלמה אחורית"</string>
     <string name="dialog_ok" msgid="774141340500181131">"אישור"</string>
-    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"השטח בכרטיס ה-SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
+    <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"‏השטח בכרטיס ה-SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
     <string name="video_reach_size_limit" msgid="9196836111505731836">"הגעת למגבלת הגודל."</string>
     <string name="pano_too_fast_prompt" msgid="2503148095578052177">"מהר מדי"</string>
     <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"מכין פנורמה"</string>
@@ -217,11 +219,11 @@
     <string name="accessibility_shutter_button" msgid="6040483605347230438">"לחצן הצילום"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"לחצן תפריט"</string>
     <string name="accessibility_mode_picker" msgid="5107120667206453381">"בורר מצב מצלמה, וידאו או פנורמה"</string>
-    <string name="accessibility_check_box" msgid="1084094675439953723">"תיבת סימון %1$s"</string>
+    <string name="accessibility_check_box" msgid="1084094675439953723">"‏תיבת סימון %1$s"</string>
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"עבור לצילום תמונות"</string>
     <string name="accessibility_switch_to_video" msgid="8174781871592793967">"עבור לצילום וידאו"</string>
     <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"עבור לצילום פנורמה"</string>
-    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"עבור לצילום Photo Sphere"</string>
+    <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"‏עבור לצילום Photo Sphere"</string>
     <string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"עבור לאיכות גבוהה"</string>
     <string name="accessibility_review_cancel" msgid="5462850829869569629">"ביטול בדיקה"</string>
     <string name="accessibility_review_ok" msgid="3486465319880320270">"בדיקה בוצעה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 761a48bc6..503ac3457 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SDカードを準備しています…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SDカードにアクセスできませんでした。"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"低速度撮影"</string>
+    <string name="capturing" msgid="5255164204641920893">"キャプチャしています"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"カメラを選択"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"戻る"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"前面"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2Mピクセル（16:9）"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5Mピクセル"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1メガピクセル"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"オート"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+をONにする"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+をOFFにする"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDRをONにする"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDRをOFFにする"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ON"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ OFF"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ON"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR OFF"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"スポーツ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"夕焼け"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 8722085cf..2cf9557a5 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD ბარათის მომზადება…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD ბარათზე წვდომა ვერ განხორციელდა."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"ინტერვალური გადაღება"</string>
+    <string name="capturing" msgid="5255164204641920893">"მიმდინარეობს შეყვანა"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"კამერის არჩევა"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"უკან"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"წინ"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 მეგაპიქსელი"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 მეგაპიქსელი"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 მეგაპიქსელი (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 მეგაპიქსელი"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 მეგაპიქსელი"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 მეგაპიქსელი"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ავტომატური"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+\'ის ჩართვა"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+\'ის გამორთვა"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR-ის ჩართვა"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR-ის გამორთვა"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ჩართ."</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ გამორთ."</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ჩართ."</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR გამორთ."</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"მოქმედება"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ღამე"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"მზის ჩასვლა"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e76c2c96e..4ac792243 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"កំពុងរៀបចំកាតអេសឌី..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"មិនអាចចូលដំណើរការកាតអេសឌី។"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"កំណត់ត្រាពេលវេលាកន្លងទៅ"</string>
+    <string name="capturing" msgid="5255164204641920893">"កំពុងចាប់យក"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"ជ្រើសម៉ាស៊ីនថត"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"ខាងក្រោយ"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"ខាងមុខ"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"៣ មេហ្គាភីកសែល"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"២ មេហ្គាភីកសែល"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"២ មេហ្គាភីកសែល (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"១.៥ មេហ្គាភីកសែល"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"១.៣ មេហ្គាភីកសែល"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"១ មេហ្គាភីកសែល"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ស្វ័យប្រវត្តិ"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"បើក HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"បិទ HDR++"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"បើក HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"បិទ HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"បើក HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"បិទ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"បើក HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"បិទ HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"សកម្មភាព"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"រាត្រី"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ថ្ងៃលិច"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1e5378f06..29e6583b7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD 카드 준비 중..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD 카드에 액세스할 수 없습니다."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"시간 경과 모드"</string>
+    <string name="capturing" msgid="5255164204641920893">"캡처 중"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"카메라 선택"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"이전"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"전면"</string>
@@ -116,12 +117,13 @@
     <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="686045304547541815">"사진 크기"</string>
     <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300만 화소"</string>
-    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8백만 화소"</string>
+    <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800만 화소"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500만 화소"</string>
     <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"400만 화소"</string>
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300만 화소"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200만 화소"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200만 화소(16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150만 화소"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130만 화소"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"100만 화소"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"자동"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ 켜기"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ 끄기"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR 켜기"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR 끄기"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ 사용"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ 사용 안함"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR 사용"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR 사용 안함"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"액션"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"밤"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"일몰"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 62250754f..f70018ada 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"ກຳລັງກະກຽມ SD card ..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"ບໍ່ສາມາດເຂົ້າເຖິງ SD card ໄດ້."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"ການບັນທຶກພາບທາມແລບ"</string>
+    <string name="capturing" msgid="5255164204641920893">"ກຳລັງບັນທຶກ"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"ເລືອກກ້ອງ"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"ກັບຄືນ"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"ໜ້າ"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ລ້ານພິກເຊວ"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ລ້ານພິກເຊວ"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ລ້ານພິກເຊວ (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ລ້ານພິກເຊວ"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 ລ້ານພິກເຊວ"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 ລ້ານພິກເຊວ"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ອັດຕະໂນມັດ"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"ເປີດໂໝດ HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"ປິດໂໝດ HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"ເປີດໂໝດ HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"ປິດໂໝດ HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ເປີດ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ ປິດ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ເປີດ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR ປິດ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"ແອັກຊັນ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"ຕອນຄ່ຳ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ຕາເວັນຕົກ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1f45d26fe..39ee62da6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Ruošiama SD kortelė…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nepavyko pasiekti SD kortelės."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Įrašoma laiko intervalu"</string>
+    <string name="capturing" msgid="5255164204641920893">"Fiksuojama"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Pasirin. fotoaparatą"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Atgal"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Į priekį"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseliai"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseliai"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiks. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapiks."</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikselio"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapikselis"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatinis"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Įjungti HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Išjungti HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Įjungti HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Išjungti HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ funkcija įjungta"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ funkcija išjungta"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR funkcija įjungta"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR funkcija išjungta"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Veiksmas"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Naktis"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Saulėlydis"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5db716f16..7f3ec11b9 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD kartes sagatavošana..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nevarēja piekļūt SD kartei."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Intervāla fotografēšanas režīms"</string>
+    <string name="capturing" msgid="5255164204641920893">"Uzņem attēlu…"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Kameras izvēle"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Aizmugurējā"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Priekšējā"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiks. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapikseļi"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapikselis"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -155,12 +157,12 @@
     <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"MĀKOŅAINS"</string>
     <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Ainavas režīms"</string>
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automātiski"</string>
-    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"Augsts din.diap."</string>
+    <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"Augsts din.diap."</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ieslēgt uzlaboto augsto dinamisko diapazonu"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Izslēgt uzlaboto augsto dinamisko diapazonu"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ieslēgt augsto dinamisko diapazonu"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Izslēgt augsto dinamisko diapazonu"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"IESLĒGTS HDR+ REŽĪMS"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"IZSLĒGTS HDR+ REŽĪMS"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"IESLĒGTS AUGSTS DINAMISKAIS DIAPAZONS"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"IZSLĒGTS AUGSTS DINAMISKAIS DIAPAZONS"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Kustība"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nakts"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Saulriets"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index bf0df9d89..eb6d3704b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD карт бэлдэж байна…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD картад хандаж чадсангүй."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Цагийн урсгал бичигдэж байна"</string>
+    <string name="capturing" msgid="5255164204641920893">"Авч байна"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Камер сонгох"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Буцах"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Өмнөх"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M пиксел"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M пиксел"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M пиксел (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M пиксел"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M пиксел"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M пиксел"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Автомат"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ асаах"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ унтраах"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR-г асаах"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR-г унтраах"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ИДЭВХЖСЭН"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ ИДЭВХГҮЙ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ИДЭВХЖСЭН"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR ИДЭВХГҮЙ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Үйлдэл"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Шөнө"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Нар жаргах"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index ce353041f..ff24fe4ad 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Menyediakan kad SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Tidak dapat mengakses kad SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Rakaman selang masa"</string>
+    <string name="capturing" msgid="5255164204641920893">"Menangkap"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Pilih kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Kembali"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Depan"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M piksel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M piksel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M piksel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M piksel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M piksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Hidupkan HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Matikan HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Hidupkan HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Matikan HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ DIHIDUPKAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DIMATIKAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR DIHIDUPKAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DIMATIKAN"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tindakan"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Malam"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Senja"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index eb8c0d0b4..6ee3286cd 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Forbereder SD-kort …"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Får ikke tilgang til SD-kort."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Tidsintervallopptak"</string>
+    <string name="capturing" msgid="5255164204641920893">"Tar bilde …"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Velg kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Tilbake"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontkamera"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksler"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksler"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiksler (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M piksler"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapiksler"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Slå på HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Slå av HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Slå på HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Slå av HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ PÅ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ AV"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR PÅ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR AV"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Solnedgang"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1c886db60..66cf12c6c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD-kaart voorbereiden…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Geen toegang tot SD-kaart."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Time-lapse-opname"</string>
+    <string name="capturing" msgid="5255164204641920893">"Vastleggen"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Camera selecteren"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Achterzijde"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Voorzijde"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatisch"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+ inschakelen"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+ uitschakelen"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR inschakelen"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR uitschakelen"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ AAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ UIT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR AAN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR UIT"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Actie"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Nacht"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zonsondergang"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index dfa2353ed..0f918e626 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Przygotowuję kartę SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nie udało się otworzyć karty SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Nagrywanie poklatkowe"</string>
+    <string name="capturing" msgid="5255164204641920893">"Robię zdjęcie"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Wybierz aparat"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Tylny"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Przedni"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpix"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpix"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpix (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mln pikseli"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpix"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpix"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatycznie"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Włącz HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Wyłącz HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Włącz HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Wyłącz HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ WŁĄCZONY"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ WYŁĄCZONY"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR WŁĄCZONY"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR WYŁĄCZONY"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akcja"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zachód słońca"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 73ead39bc..dcd48b041 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"A preparar cartão SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Não foi possível aceder ao cartão SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Gravação com intervalo de tempo"</string>
+    <string name="capturing" msgid="5255164204641920893">"A capturar"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Escolher câmara"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Anterior"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontal"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapíxeis"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ativar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desativar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ativar HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desativar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ATIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DESATIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ATIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DESATIVADO"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ação"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noite"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Pôr do sol"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b97294258..e3e9517b3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparando cartão SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Não foi possível acessar o cartão SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Gravação de passagem de tempo"</string>
+    <string name="capturing" msgid="5255164204641920893">"Capturando"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Escolher câmera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Voltar"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Frontal"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 MP"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automático"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Ativar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Desativar HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Ativar HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Desativar HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ATIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DESATIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ATIVADO"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DESATIVADO"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Ação"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noite"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Pôr do sol"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c11fef48c..001108aa6 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Se pregătește cardul SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nu s-a putut accesa cardul SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Înregistrare cu filmare lentă"</string>
+    <string name="capturing" msgid="5255164204641920893">"Se capturează"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Alegeți camera foto"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Înapoi"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Față"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 MP"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 MP"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 MP"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automat"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Activați HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Dezactivați HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Activați HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Dezactivați HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ACTIVAT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ DEZACTIVAT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ACTIVAT"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR DEZACTIVAT"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Acțiune"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noapte"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Apus de soare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fa18753b3..62d1769cb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Подготовка SD-карты…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Нет доступа к SD-карте"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Режим замедленной съемки"</string>
+    <string name="capturing" msgid="5255164204641920893">"Подождите…"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Выбор камеры"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Основная"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Фронтальная"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Мпикс. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Мпикс."</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"640 х 480 пикс."</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Авто"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Включить HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Отключить HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Включить HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Отключить HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"ВКЛЮЧИТЬ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"ОТКЛЮЧИТЬ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"ВКЛЮЧИТЬ HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"ОТКЛЮЧИТЬ HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"В движении"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ночная съемка"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Закат"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b81cf02ca..9be1e91c6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Príprava karty SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Nepodarilo sa získať prístup ku karte SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Časozberný záznam"</string>
+    <string name="capturing" msgid="5255164204641920893">"Prebieha snímanie"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Vybrať fotoaparát"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Späť"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Predný"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpx"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpx (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Mpx"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mpx"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Mpx"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automaticky"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Zapnúť HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Vypnúť HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Zapnúť HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Vypnúť HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ ZAPNUTÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ VYPNUTÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ZAPNUTÉ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR VYPNUTÉ"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Akcia"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noc"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Západ slnka"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 488138457..3af43a200 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Priprava kartice SD …"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Dostop do kartice SD ni bil mogoč."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Snemanje s časovnim zamikom"</string>
+    <string name="capturing" msgid="5255164204641920893">"Snemanje"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Izberite fotoaparat"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Zadaj"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Spredaj"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M slikovnih pik"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M slikovnih pik"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pik (16 : 9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 mio. sl. pik"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 M slikovnih pik"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 M slikovnih pik"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Samodejno"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Vklop načina HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Izklop načina HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Vklop načina HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Izklop načina HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ VKLOPLJEN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ IZKLOPLJEN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR VKLOPLJEN"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR IZKLOPLJEN"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Gibanje"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ponoči"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sončni zahod"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5553bbd18..d3f869ba9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Припремање SD картице…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Није могуће приступити SD картици."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Снимањe у дужем интервалу"</string>
+    <string name="capturing" msgid="5255164204641920893">"Снимање"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Изаберите камеру"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Задња"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Предња"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 мегапиксела (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 мегапиксела"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 мегапиксел"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Аутоматски"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Укључи HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Искључи HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Укључи HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Искључи HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"УКЉУЧИ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"ИСКЉУЧИ HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"УКЉУЧИ HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"ИСКЉУЧИ HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Радња"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ноћ"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Залазак сунца"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b4cf2d74c..eed747053 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Förbereder SD-kort …"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Det gick inte att öppna SD-kortet."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Intervallinspelning"</string>
+    <string name="capturing" msgid="5255164204641920893">"Tar ett foto …"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Välj kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Bakre"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Främre"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixlar (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapixlar"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Aktivera HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Inaktivera HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Aktivera HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Inaktivera HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ PÅ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ AV"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR PÅ"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR AV"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Rörligt objekt"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Natt"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Solnedgång"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 5d715ba47..750b4689d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Inatayarisha kadi ya SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Haikuweza kufikia kadi ya SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Kurekodi wa muda ukipita"</string>
+    <string name="capturing" msgid="5255164204641920893">"Inapiga picha"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Chagua kamera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Nyuma"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Mbele"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"Megapikseli 3"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"Megapikseli 2"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"Megapikseli 2  (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"Pikseli Milioni 1.5"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"Megapikseli 1.3"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"Megapikseli 1"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Kiotomatiki"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Washa HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Zima HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Washa HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Zima HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ IMEWASHWA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ IMEZIMWA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR IMEWASHWA"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR IMEZIMWA"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Kitendo"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Usiku"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Machweo"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 49cc1b274..5b69f9f8a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"กำลังเตรียมการ์ด SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"ไม่สามารถเข้าถึงการ์ด SD"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"การบันทึกเป็นช่วงเวลา"</string>
+    <string name="capturing" msgid="5255164204641920893">"กำลังจับภาพ"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"เลือกกล้องถ่ายรูป"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"กลับ"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"ด้านหน้า"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ล้านพิกเซล (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 ล้านพิกเซล"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"ออโต้"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"เปิด HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"ปิด HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"เปิด HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"ปิด HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"เปิด HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"ปิด HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"เปิด HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"ปิด HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"การทำงาน"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"กลางคืน"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"ดวงอาทิตย์ตก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6789ac0a5..3737711e7 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Ihinahanda ang SD card..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Hindi ma-access ang SD card."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Pag-record ng time lapse"</string>
+    <string name="capturing" msgid="5255164204641920893">"Kinukunan"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Pumili ng camera"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Bumalik"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Harap"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M pixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M pixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M pixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"I-on ang HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"I-off ang HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"I-on ang HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"I-off ang HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"NAKA-ON ANG HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"NAKA-OFF ANG HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"NAKA-ON ANG HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"NAKA-OFF ANG HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Aksyon"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gabi"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Takipsilim"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1597fd5db..9face74ee 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD kart hazırlanıyor..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"SD karta erişilemedi."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Zaman atlamalı kayıt"</string>
+    <string name="capturing" msgid="5255164204641920893">"Fotoğraf çekiliyor"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Kamera seçin"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Arka"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Ön"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiksel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M piksel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 megapiksel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Otomatik"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"HDR+\'yı Aç"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"HDR+\'yı Kapat"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"HDR\'yi Aç"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"HDR\'yi Kapat"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ AÇIK"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ KAPALI"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR AÇIK"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR KAPALI"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Hareket"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Gece"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Gün batımı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c4a6bdfe8..8719e4b61 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Підготовка карти SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Не вдалось отримати доступ до карти SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Запис уповільненої зйомки"</string>
+    <string name="capturing" msgid="5255164204641920893">"Зйомка"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Вибрати камеру"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Задня камера"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Передня камера"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Мпікс."</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Мпікс."</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Мпікс. (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 Мпікс."</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3 Mпікс."</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 Мпікс."</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Авто"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Увімкнути режим HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Вимкнути режим HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Увімкнути режим HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Вимкнути режим HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ УВІМКНЕНО"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ ВИМКНЕНО"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR УВІМКНЕНО"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR ВИМКНЕНО"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Під час руху"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ніч"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Захід сонця"</string>
@@ -216,7 +218,7 @@
     <string name="effect_background" msgid="1358432220077975015">"ФОН"</string>
     <string name="accessibility_shutter_button" msgid="6040483605347230438">"Витримка"</string>
     <string name="accessibility_menu_button" msgid="7692103503958544723">"Кнопка меню"</string>
-    <string name="accessibility_mode_picker" msgid="5107120667206453381">"Перемикач мід режимами фото, відео чи панорами"</string>
+    <string name="accessibility_mode_picker" msgid="5107120667206453381">"Перемикач між режимами фото, відео чи панорами"</string>
     <string name="accessibility_check_box" msgid="1084094675439953723">"Прапорець %1$s"</string>
     <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Перейти в режим фото"</string>
     <string name="accessibility_switch_to_video" msgid="8174781871592793967">"Перейти в режим відео"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b5b72da87..0c9d40ba3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Đang chuẩn bị thẻ SD…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Không thể truy cập thẻ SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Đang quay ở chế độ khoảng thời gian"</string>
+    <string name="capturing" msgid="5255164204641920893">"Đang chụp"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Chọn máy ảnh"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Quay lại"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Trước"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 M pixel"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1,3M pixel"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M pixel"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Tự động"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Bật HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Tắt HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Bật HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Tắt HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"BẬT HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"TẮT HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"BẬT HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"TẮT HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Tác vụ"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Đêm"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Hoàng hôn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 136e579e5..3748af72e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"正在准备 SD 卡…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"无法使用 SD 卡。"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"延时录影"</string>
+    <string name="capturing" msgid="5255164204641920893">"正在拍摄"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"选择摄像头"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"后置"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"前置"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300万像素"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200万像素"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200万像素 (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150万像素"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130万像素"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"100万像素"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自动"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"开启 HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"关闭 HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"开启 HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"关闭 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"开启 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"关闭 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"开启 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"关闭 HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"运动"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜间"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"日落"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9e58a1beb..07523fe78 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"正在準備 SD 卡…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"無法存取 SD 卡。"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"延時攝影錄製"</string>
+    <string name="capturing" msgid="5255164204641920893">"拍攝中"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"選擇相機"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"後置鏡頭"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"前置鏡頭"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 百萬像素 (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自動"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+ (高動態範圍)"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"高動態範圍"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"開啟 HDR+ (高動態範圍)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"關閉 HDR+ (高動態範圍)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"開啟 HDR (高動態範圍)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"關閉 HDR (高動態範圍)"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"開啟 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"關閉 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"開啟 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"關閉 HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"日落"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 77d1ca7e7..9697eec7b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"正在準備 SD 卡…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"無法存取 SD 卡。"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"延時攝影錄製"</string>
+    <string name="capturing" msgid="5255164204641920893">"拍攝中"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"選擇相機"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"後置"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"前置"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300 萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200 萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200 萬像素 (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"100 萬像素"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自動"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"高動態範圍+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"高動態範圍"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"開啟 HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"關閉 HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"開啟 HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"關閉 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"開啟 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"關閉 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"開啟 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"關閉 HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"黃昏"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 999bc0b91..73554c790 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"Ilungiselela ikhadi le-SD..."</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Yehlukekile ukufinyelela kwikhadi le-SD."</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"Ukurekhoda ukuphela kwesikhathi"</string>
+    <string name="capturing" msgid="5255164204641920893">"Iyathwebula"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"Khetha ikhamela"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Emuva"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Phambili"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M amaphikiseli (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1.5M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"1.3M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1M amaphikiseli"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"I-VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Okuzenzakalelayo"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"I-HDR+"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"I-HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"Vula i-HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"Vala i-HDR+"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"Vula i-HDR"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"Vala i-HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"I-HDR+ IVULIWE"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"I-HDR+ IVALIWE"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"I-HDR IVULIWE"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"I-HDR IVALIWE"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Isenzo"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ebusuku"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Ukushona kwelanga"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 621f1c996..c77cdb314 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -181,12 +181,15 @@
         <item>@string/pref_camera_picturesize_entry_1920x1080</item>
         <item>@string/pref_camera_picturesize_entry_2mp</item>
         <item>@string/pref_camera_picturesize_entry_2mp_wide</item>
+        <item>@string/pref_camera_picturesize_entry_1_5mp</item>
         <item>@string/pref_camera_picturesize_entry_1_3mp</item>
         <item>@string/pref_camera_picturesize_entry_1280x768</item>
         <item>@string/pref_camera_picturesize_entry_1280x720</item>
         <item>@string/pref_camera_picturesize_entry_1mp</item>
         <item>@string/pref_camera_picturesize_entry_800x600</item>
         <item>@string/pref_camera_picturesize_entry_800x480</item>
+        <item>960 x 720</item>
+        <item>720 x 480</item>
         <item>@string/pref_camera_picturesize_entry_vga</item>
         <item>@string/pref_camera_picturesize_entry_352x288</item>
         <item>@string/pref_camera_picturesize_entry_qvga</item>
@@ -208,12 +211,15 @@
         <item>1920x1080</item>
         <item>1600x1200</item>
         <item>1920x1088</item>
+        <item>1440x1080</item>
         <item>1280x960</item>
         <item>1280x768</item>
         <item>1280x720</item>
         <item>1024x768</item>
         <item>800x600</item>
         <item>800x480</item>
+        <item>960x720</item>
+        <item>720x480</item>
         <item>640x480</item>
         <item>352x288</item>
         <item>320x240</item>
@@ -500,8 +506,8 @@
     </string-array>
 
     <string-array name="pref_camera_hdr_plus_labels" translatable="false">
-        <item>@string/pref_camera_scenemode_entry_hdr_plus</item>
-        <item>@string/pref_camera_scenemode_entry_hdr_plus</item>
+        <item>@string/pref_camera_scenemode_entry_turn_hdr_plus_on</item>
+        <item>@string/pref_camera_scenemode_entry_turn_hdr_plus_off</item>
     </string-array>
 
     <string-array name="pref_camera_hdr_plus_icons" translatable="false">
@@ -521,8 +527,8 @@
     </string-array>
 
     <string-array name="pref_camera_hdr_labels" translatable="false">
-        <item>@string/pref_camera_hdr_label</item>
-        <item>@string/pref_camera_hdr_label</item>
+        <item>@string/pref_camera_scenemode_entry_turn_hdr_on</item>
+        <item>@string/pref_camera_scenemode_entry_turn_hdr_off</item>
     </string-array>
 
     <string-array name="pref_camera_hdr_icons" translatable="false">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 692a87fbf..e2d4246df 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -74,6 +74,8 @@
     <dimen name="effect_setting_type_text_left_padding_xlarge">26dp</dimen>
     <dimen name="onscreen_indicators_height_xlarge">36dp</dimen>
     <dimen name="onscreen_exposure_indicator_text_size_xlarge">18dp</dimen>
+    <dimen name="pie_progress_radius">25dp</dimen>
+    <dimen name="pie_progress_width">3dp</dimen>
     <dimen name="pie_radius_start">80dp</dimen>
     <dimen name="pie_radius_increment">48dp</dimen>
     <dimen name="pie_touch_slop">12dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 04b765879..5d2b09bcc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -185,6 +185,9 @@
     <!-- A label that overlays on top of the preview frame to indicate the camcorder is in time lapse mode [CHAR LIMIT=35] -->
     <string name="time_lapse_title">Time lapse recording</string>
 
+    <!-- Screen display message during image capture to indicate that the capture is in progress, like during HDR+. [CHAR LIMIT=20] -->
+    <string name="capturing">Capturing</string>
+
     <!-- Settings screen, camera selection dialog title. Users can select a camera from the phone (front-facing or back-facing). [CHAR LIMIT=20] -->
     <string name="pref_camera_id_title">Choose camera</string>
 
@@ -267,6 +270,8 @@
     <string name="pref_camera_picturesize_entry_2mp">2M pixels</string>
     <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>
+    <!-- Settings screen, dialog choice for 1.5 megapixels picture size [CHAR LIMIT=20] -->
+    <string name="pref_camera_picturesize_entry_1_5mp">1.5M pixels</string>
     <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>
     <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] -->
@@ -353,13 +358,13 @@
     <!-- Scene mode that uses HDR (high dynamic range) [CHAR LIMIT=16] -->
     <string name="pref_camera_scenemode_entry_hdr">HDR</string>
     <!-- Scene mode to turn on HDR (better high dynamic range) [CHAR LIMIT=50] -->
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">Turn HDR+ On</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on">HDR+ ON</string>
     <!-- Scene mode to turn off HDR (better high dynamic range) [CHAR LIMIT=50] -->
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">Turn HDR+ Off</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off">HDR+ OFF</string>
     <!-- Scene mode to turn on HDR (high dynamic range) [CHAR LIMIT=50] -->
-    <string name="pref_camera_scenemode_entry_turn_hdr_on">Turn HDR On</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on">HDR ON</string>
     <!-- Scene mode to turn off HDR (high dynamic range) [CHAR LIMIT=50] -->
-    <string name="pref_camera_scenemode_entry_turn_hdr_off">Turn HDR Off</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off">HDR OFF</string>
     <!-- Scene mode that takes an image quickly with little motion blur. [CHAR LIMIT=16] -->
     <string name="pref_camera_scenemode_entry_action">Action</string>
     <!-- Scene mode that takes long exposures to capture night scenes without flash. [CHAR LIMIT=16] -->
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index b72fbd0da..5b70897e3 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -348,8 +348,14 @@ class AndroidCameraManagerImpl implements CameraManager {
                     }
                     mCamera = null;
                 } else if (mCamera == null) {
-                  Log.w(TAG, "Cannot handle message, mCamera is null.");
-                  return;
+                    if (msg.what == OPEN_CAMERA) {
+                        if (msg.obj != null) {
+                            ((CameraOpenErrorCallback) msg.obj).onDeviceOpenFailure(msg.arg1);
+                        }
+                    } else {
+                        Log.w(TAG, "Cannot handle message, mCamera is null.");
+                    }
+                    return;
                 }
                 throw e;
             }
@@ -848,7 +854,10 @@ class AndroidCameraManagerImpl implements CameraManager {
 
         private CameraOpenErrorCallbackForward(
                 Handler h, CameraOpenErrorCallback cb) {
-            mHandler = h;
+            // Given that we are using the main thread handler, we can create it
+            // here instead of holding onto the PhotoModule objects. In this
+            // way, we can avoid memory leak.
+            mHandler = new Handler(Looper.getMainLooper());
             mCallback = cb;
         }
 
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index df2195844..9e5ddb0b2 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -64,6 +64,7 @@ import android.widget.ProgressBar;
 import android.widget.ShareActionProvider;
 
 import com.android.camera.app.AppManagerFactory;
+import com.android.camera.app.PlaceholderManager;
 import com.android.camera.app.PanoramaStitchingManager;
 import com.android.camera.crop.CropActivity;
 import com.android.camera.data.CameraDataAdapter;
@@ -83,15 +84,20 @@ import com.android.camera.ui.FilmStripView;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
+import com.android.camera.util.IntentHelper;
 import com.android.camera.util.PhotoSphereHelper;
 import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
+import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 
+import java.io.File;
+
 import static com.android.camera.CameraManager.CameraOpenErrorCallback;
 
 public class CameraActivity extends Activity
         implements ModuleSwitcher.ModuleSwitchListener,
-        ActionBar.OnMenuVisibilityListener {
+        ActionBar.OnMenuVisibilityListener,
+        ShareActionProvider.OnShareTargetSelectedListener {
 
     private static final String TAG = "CAM_Activity";
 
@@ -143,6 +149,7 @@ public class CameraActivity extends Activity
     private LocalDataAdapter mWrappedDataAdapter;
 
     private PanoramaStitchingManager mPanoramaManager;
+    private PlaceholderManager mPlaceholderManager;
     private int mCurrentModuleIndex;
     private CameraModule mCurrentModule;
     private FrameLayout mAboveFilmstripControlLayout;
@@ -226,18 +233,27 @@ public class CameraActivity extends Activity
             new CameraOpenErrorCallback() {
                 @Override
                 public void onCameraDisabled(int cameraId) {
+                    UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                            UsageStatistics.ACTION_OPEN_FAIL, "security");
+
                     CameraUtil.showErrorAndFinish(CameraActivity.this,
                             R.string.camera_disabled);
                 }
 
                 @Override
                 public void onDeviceOpenFailure(int cameraId) {
+                    UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                            UsageStatistics.ACTION_OPEN_FAIL, "open");
+
                     CameraUtil.showErrorAndFinish(CameraActivity.this,
                             R.string.cannot_connect_camera);
                 }
 
                 @Override
                 public void onReconnectionFailure(CameraManager mgr) {
+                    UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                            UsageStatistics.ACTION_OPEN_FAIL, "reconnect");
+
                     CameraUtil.showErrorAndFinish(CameraActivity.this,
                             R.string.cannot_connect_camera);
                 }
@@ -290,15 +306,30 @@ public class CameraActivity extends Activity
         sFirstStartAfterScreenOn = false;
     }
 
+    private String fileNameFromDataID(int dataID) {
+        final LocalData localData = mDataAdapter.getLocalData(dataID);
+
+        File localFile = new File(localData.getPath());
+        return localFile.getName();
+    }
+
     private FilmStripView.Listener mFilmStripListener =
             new FilmStripView.Listener() {
                 @Override
                 public void onDataPromoted(int dataID) {
+                    UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                            UsageStatistics.ACTION_DELETE, "promoted", 0,
+                            UsageStatistics.hashFileName(fileNameFromDataID(dataID)));
+
                     removeData(dataID);
                 }
 
                 @Override
                 public void onDataDemoted(int dataID) {
+                    UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                            UsageStatistics.ACTION_DELETE, "demoted", 0,
+                            UsageStatistics.hashFileName(fileNameFromDataID(dataID)));
+
                     removeData(dataID);
                 }
 
@@ -340,6 +371,7 @@ public class CameraActivity extends Activity
                 @Override
                 public void onReload() {
                     setPreviewControlsVisibility(true);
+                    CameraActivity.this.setSystemBarsVisibility(false);
                 }
 
                 @Override
@@ -351,6 +383,7 @@ public class CameraActivity extends Activity
 
                     if(!arePreviewControlsVisible()) {
                         setPreviewControlsVisibility(true);
+                        CameraActivity.this.setSystemBarsVisibility(false);
                     }
                 }
 
@@ -457,6 +490,9 @@ public class CameraActivity extends Activity
             };
 
     public void gotoGallery() {
+        UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, UsageStatistics.ACTION_FILMSTRIP,
+                "thumbnailTap");
+
         mFilmStripView.getController().goToNextItem();
     }
 
@@ -476,13 +512,17 @@ public class CameraActivity extends Activity
      */
     private void setSystemBarsVisibility(boolean visible, boolean hideLater) {
         mMainHandler.removeMessages(HIDE_ACTION_BAR);
-        boolean currentlyVisible = mActionBar.isShowing();
 
-        if (visible != currentlyVisible) {
-            int visibility = DEFAULT_SYSTEM_UI_VISIBILITY | (visible ? View.SYSTEM_UI_FLAG_VISIBLE
-                    : View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN);
-            mAboveFilmstripControlLayout.setSystemUiVisibility(visibility);
+        int currentSystemUIVisibility = mAboveFilmstripControlLayout.getSystemUiVisibility();
+        int newSystemUIVisibility = DEFAULT_SYSTEM_UI_VISIBILITY |
+                (visible ? View.SYSTEM_UI_FLAG_VISIBLE :
+                        View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN);
+        if (newSystemUIVisibility != currentSystemUIVisibility) {
+            mAboveFilmstripControlLayout.setSystemUiVisibility(newSystemUIVisibility);
+        }
 
+        boolean currentActionBarVisibility = mActionBar.isShowing();
+        if (visible != currentActionBarVisibility) {
             if (visible) {
                 mActionBar.show();
             } else {
@@ -593,6 +633,18 @@ public class CameraActivity extends Activity
         }
     }
 
+    @Override
+    public boolean onShareTargetSelected(ShareActionProvider shareActionProvider, Intent intent) {
+        int currentDataId = mFilmStripView.getCurrentId();
+        if (currentDataId < 0) {
+            return false;
+        }
+        UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA, UsageStatistics.ACTION_SHARE,
+                intent.getComponent().getPackageName(), 0,
+                UsageStatistics.hashFileName(fileNameFromDataID(currentDataId)));
+        return true;
+    }
+
     /**
      * According to the data type, make the menu items for supported operations
      * visible.
@@ -701,6 +753,41 @@ public class CameraActivity extends Activity
             item.setVisible(visible);
     }
 
+    private ImageTaskManager.TaskListener mPlaceholderListener =
+            new ImageTaskManager.TaskListener() {
+
+                @Override
+                public void onTaskQueued(String filePath, final Uri imageUri) {
+                    mMainHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            notifyNewMedia(imageUri);
+                            int dataID = mDataAdapter.findDataByContentUri(imageUri);
+                            if (dataID != -1) {
+                                LocalData d = mDataAdapter.getLocalData(dataID);
+                                InProgressDataWrapper newData = new InProgressDataWrapper(d, true);
+                                mDataAdapter.updateData(dataID, newData);
+                            }
+                        }
+                    });
+                }
+
+                @Override
+                public void onTaskDone(String filePath, final Uri imageUri) {
+                    mMainHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            mDataAdapter.refresh(getContentResolver(), imageUri);
+                        }
+                    });
+                }
+
+                @Override
+                public void onTaskProgress(String filePath, Uri imageUri, int progress) {
+                    // Do nothing
+                }
+    };
+
     private ImageTaskManager.TaskListener mStitchingListener =
             new ImageTaskManager.TaskListener() {
                 @Override
@@ -774,6 +861,8 @@ public class CameraActivity extends Activity
             mDataAdapter.addNewPhoto(cr, uri);
         } else if (mimeType.startsWith("application/stitching-preview")) {
             mDataAdapter.addNewPhoto(cr, uri);
+        } else if (mimeType.startsWith(PlaceholderManager.PLACEHOLDER_MIME_TYPE)) {
+            mDataAdapter.addNewPhoto(cr, uri);
         } else {
             android.util.Log.w(TAG, "Unknown new media with MIME type:"
                     + mimeType + ", uri:" + uri);
@@ -826,6 +915,9 @@ public class CameraActivity extends Activity
             mPanoramaShareActionProvider.setShareIntent(mPanoramaShareIntent);
         }
 
+        mStandardShareActionProvider.setOnShareTargetSelectedListener(this);
+        mPanoramaShareActionProvider.setOnShareTargetSelectedListener(this);
+
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -842,18 +934,22 @@ public class CameraActivity extends Activity
             case android.R.id.home:
                 // ActionBar's Up/Home button was clicked
                 try {
-                    if (!CameraUtil.launchGallery(CameraActivity.this)) {
-                        mFilmStripView.getController().goToFirstItem();
-                    }
+                    startActivity(IntentHelper.getGalleryIntent(this));
                     return true;
                 } catch (ActivityNotFoundException e) {
-                    Log.w(TAG, "No activity found to handle APP_GALLERY category!");
+                    Log.w(TAG, "Failed to launch gallery activity, closing");
                     finish();
                 }
             case R.id.action_delete:
+                UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                        UsageStatistics.ACTION_DELETE, null, 0,
+                        UsageStatistics.hashFileName(fileNameFromDataID(currentDataId)));
                 removeData(currentDataId);
                 return true;
             case R.id.action_edit:
+                UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                        UsageStatistics.ACTION_EDIT, null, 0,
+                        UsageStatistics.hashFileName(fileNameFromDataID(currentDataId)));
                 launchEditor(localData);
                 return true;
             case R.id.action_trim: {
@@ -874,6 +970,9 @@ public class CameraActivity extends Activity
                 localData.rotate90Degrees(this, mDataAdapter, currentDataId, true);
                 return true;
             case R.id.action_crop: {
+                UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                        UsageStatistics.ACTION_CROP, null, 0,
+                        UsageStatistics.hashFileName(fileNameFromDataID(currentDataId)));
                 Intent intent = new Intent(CropActivity.CROP_ACTION);
                 intent.setClass(this, CropActivity.class);
                 intent.setDataAndType(localData.getContentUri(), localData.getMimeType())
@@ -979,7 +1078,10 @@ public class CameraActivity extends Activity
         this.setSystemBarsVisibility(false);
         mPanoramaManager = AppManagerFactory.getInstance(this)
                 .getPanoramaStitchingManager();
+        mPlaceholderManager = AppManagerFactory.getInstance(this)
+                .getGcamProcessingManager();
         mPanoramaManager.addTaskListener(mStitchingListener);
+        mPlaceholderManager.addTaskListener(mPlaceholderListener);
         LayoutInflater inflater = getLayoutInflater();
         View rootLayout = inflater.inflate(R.layout.camera, null, false);
         mCameraModuleRootView = rootLayout.findViewById(R.id.camera_app_root);
@@ -1008,8 +1110,14 @@ public class CameraActivity extends Activity
             moduleIndex = ModuleSwitcher.VIDEO_MODULE_INDEX;
         } else if (MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA.equals(getIntent().getAction())
                 || MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(getIntent()
-                        .getAction())
-                || MediaStore.ACTION_IMAGE_CAPTURE.equals(getIntent().getAction())
+                        .getAction())) {
+            moduleIndex = ModuleSwitcher.PHOTO_MODULE_INDEX;
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            if (prefs.getInt(CameraSettings.KEY_STARTUP_MODULE_INDEX, -1)
+                        == ModuleSwitcher.GCAM_MODULE_INDEX && GcamHelper.hasGcamCapture()) {
+                moduleIndex = ModuleSwitcher.GCAM_MODULE_INDEX;
+            }
+        } else if (MediaStore.ACTION_IMAGE_CAPTURE.equals(getIntent().getAction())
                 || MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(getIntent().getAction())) {
             moduleIndex = ModuleSwitcher.PHOTO_MODULE_INDEX;
         } else {
@@ -1041,7 +1149,13 @@ public class CameraActivity extends Activity
             v.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    CameraUtil.launchGallery(CameraActivity.this);
+                    try {
+                        UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                                UsageStatistics.ACTION_GALLERY, null);
+                        startActivity(IntentHelper.getGalleryIntent(CameraActivity.this));
+                    } catch (ActivityNotFoundException e) {
+                        Log.w(TAG, "Failed to launch gallery activity, closing");
+                    }
                     finish();
                 }
             });
@@ -1138,6 +1252,10 @@ public class CameraActivity extends Activity
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
             mAutoRotateScreen = true;
         }
+
+        UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                UsageStatistics.ACTION_FOREGROUNDED, this.getClass().getSimpleName());
+
         mOrientationListener.enable();
         mCurrentModule.onResumeBeforeSuper();
         super.onResume();
@@ -1364,8 +1482,12 @@ public class CameraActivity extends Activity
             Intent intent = new Intent(Intent.ACTION_EDIT)
                     .setDataAndType(data.getContentUri(), data.getMimeType())
                     .setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            startActivityForResult(Intent.createChooser(intent, null),
-                    REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+            try {
+                startActivityForResult(intent, REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+            } catch (ActivityNotFoundException e) {
+                startActivityForResult(Intent.createChooser(intent, null),
+                        REQ_CODE_DONT_SWITCH_TO_PREVIEW);
+            }
             mIsEditActivityInProgress = true;
         }
     }
@@ -1404,7 +1526,10 @@ public class CameraActivity extends Activity
         }
         hideUndoDeletionBar(false);
         mDataAdapter.executeDeletion(CameraActivity.this);
-        updateActionBarMenu(mFilmStripView.getCurrentId());
+
+        int currentId = mFilmStripView.getCurrentId();
+        updateActionBarMenu(currentId);
+        mFilmStripListener.onCurrentDataCentered(currentId);
     }
 
     public void showUndoDeletionBar() {
@@ -1485,6 +1610,7 @@ public class CameraActivity extends Activity
 
     @Override
     public void onShowSwitcherPopup() {
+        mCurrentModule.onShowSwitcherPopup();
     }
 
     /**
diff --git a/src/com/android/camera/ComboPreferences.java b/src/com/android/camera/ComboPreferences.java
index 142f6984c..42cf62423 100644
--- a/src/com/android/camera/ComboPreferences.java
+++ b/src/com/android/camera/ComboPreferences.java
@@ -330,6 +330,5 @@ public class ComboPreferences implements
             listener.onSharedPreferenceChanged(this, key);
         }
         BackupManager.dataChanged(mPackageName);
-        UsageStatistics.onEvent("CameraSettingsChange", null, key);
     }
 }
diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java
index 37d632745..9558944c0 100644
--- a/src/com/android/camera/FocusOverlayManager.java
+++ b/src/com/android/camera/FocusOverlayManager.java
@@ -29,6 +29,7 @@ import android.os.Message;
 import android.util.Log;
 
 import com.android.camera.util.CameraUtil;
+import com.android.camera.util.UsageStatistics;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -76,8 +77,6 @@ public class FocusOverlayManager {
     private boolean mAeAwbLock;
     private Matrix mMatrix;
 
-    private int mPreviewWidth; // The width of the preview frame layout.
-    private int mPreviewHeight; // The height of the preview frame layout.
     private boolean mMirror; // true if the camera is front-facing.
     private int mDisplayOrientation;
     private List<Object> mFocusArea; // focus area in driver format
@@ -94,6 +93,7 @@ public class FocusOverlayManager {
     private boolean mZslEnabled = false;  //QCom Parameter to disable focus for ZSL
 
     private FocusUI mUI;
+    private final Rect mPreviewRect = new Rect(0, 0, 0, 0);
 
     public  interface FocusUI {
         public boolean hasFaces();
@@ -160,13 +160,25 @@ public class FocusOverlayManager {
     }
 
     public void setPreviewSize(int previewWidth, int previewHeight) {
-        if (mPreviewWidth != previewWidth || mPreviewHeight != previewHeight) {
-            mPreviewWidth = previewWidth;
-            mPreviewHeight = previewHeight;
+        if (mPreviewRect.width() != previewWidth || mPreviewRect.height() != previewHeight) {
+            setPreviewRect(new Rect(0, 0, previewWidth, previewHeight));
+        }
+    }
+
+    /** This setter should be the only way to mutate mPreviewRect. */
+    public void setPreviewRect(Rect previewRect) {
+        if (!mPreviewRect.equals(previewRect)) {
+            mPreviewRect.set(previewRect);
             setMatrix();
         }
     }
 
+    /** Returns a copy of mPreviewRect so that outside class cannot modify preview
+     *  rect except deliberately doing so through the setter. */
+    public Rect getPreviewRect() {
+        return new Rect(mPreviewRect);
+    }
+
     public void setMirror(boolean mirror) {
         mMirror = mirror;
         setMatrix();
@@ -178,10 +190,9 @@ public class FocusOverlayManager {
     }
 
     private void setMatrix() {
-        if (mPreviewWidth != 0 && mPreviewHeight != 0) {
+        if (mPreviewRect.width() != 0 && mPreviewRect.height() != 0) {
             Matrix matrix = new Matrix();
-            CameraUtil.prepareMatrix(matrix, mMirror, mDisplayOrientation,
-                    mPreviewWidth, mPreviewHeight);
+            CameraUtil.prepareMatrix(matrix, mMirror, mDisplayOrientation, getPreviewRect());
             // In face detection, the matrix converts the driver coordinates to UI
             // coordinates. In tap focus, the inverted matrix converts the UI
             // coordinates to driver coordinates.
@@ -348,12 +359,15 @@ public class FocusOverlayManager {
     public void onSingleTapUp(int x, int y) {
         if (!mInitialized || mState == STATE_FOCUSING_SNAP_ON_FINISH) return;
 
+        UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                UsageStatistics.ACTION_TOUCH_FOCUS, x + "," + y);
+
         // Let users be able to cancel previous touch focus.
         if ((!mFocusDefault) && (mState == STATE_FOCUSING ||
                     mState == STATE_SUCCESS || mState == STATE_FAIL)) {
             cancelAutoFocus();
         }
-        if (mPreviewWidth == 0 || mPreviewHeight == 0) return;
+        if (mPreviewRect.width() == 0 || mPreviewRect.height() == 0) return;
         mFocusDefault = false;
         // Initialize mFocusArea.
         if (mFocusAreaSupported) {
@@ -512,7 +526,7 @@ public class FocusOverlayManager {
         mMeteringArea = null;
 
         if (mFocusAreaSupported) {
-            initializeFocusAreas(mPreviewWidth / 2, mPreviewHeight / 2);
+            initializeFocusAreas(mPreviewRect.centerX(), mPreviewRect.centerY());
         }
         // Reset metering area when no specific region is selected.
         if (mMeteringAreaSupported) {
@@ -523,8 +537,10 @@ public class FocusOverlayManager {
 
     private void calculateTapArea(int x, int y, float areaMultiple, Rect rect) {
         int areaSize = (int) (getAreaSize() * areaMultiple);
-        int left = CameraUtil.clamp(x - areaSize / 2, 0, mPreviewWidth - areaSize);
-        int top = CameraUtil.clamp(y - areaSize / 2, 0, mPreviewHeight - areaSize);
+        int left = CameraUtil.clamp(x - areaSize / 2, mPreviewRect.left,
+                mPreviewRect.right - areaSize);
+        int top = CameraUtil.clamp(y - areaSize / 2, mPreviewRect.top,
+                mPreviewRect.bottom - areaSize);
 
         RectF rectF = new RectF(left, top, left + areaSize, top + areaSize);
         mMatrix.mapRect(rectF);
@@ -534,7 +550,7 @@ public class FocusOverlayManager {
     private int getAreaSize() {
         // Recommended focus area size from the manufacture is 1/8 of the image
         // width (i.e. longer edge of the image)
-        return Math.max(mPreviewWidth, mPreviewHeight) / 8;
+        return Math.max(mPreviewRect.width(), mPreviewRect.height()) / 8;
     }
 
     /* package */ int getFocusState() {
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index 40f9bfe74..2a33fb098 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -27,6 +27,7 @@ import android.util.Log;
 import android.util.TypedValue;
 
 import com.android.camera.util.CameraUtil;
+import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 
 /**
@@ -161,6 +162,7 @@ public class ListPreference extends CameraPreference {
         SharedPreferences.Editor editor = getSharedPreferences().edit();
         editor.putString(mKey, value);
         editor.apply();
+        UsageStatistics.onEvent("CameraSettingsChange", value, mKey);
     }
 
     @Override
diff --git a/src/com/android/camera/PhotoController.java b/src/com/android/camera/PhotoController.java
index f6898a34f..c1c3a8562 100644
--- a/src/com/android/camera/PhotoController.java
+++ b/src/com/android/camera/PhotoController.java
@@ -16,6 +16,7 @@
 
 package com.android.camera;
 
+import android.graphics.Rect;
 import android.view.View;
 
 import com.android.camera.ShutterButton.OnShutterButtonListener;
@@ -58,6 +59,8 @@ public interface PhotoController extends OnShutterButtonListener {
 
     public void onScreenSizeChanged(int width, int height);
 
+    public void onPreviewRectChanged(Rect previewRect);
+
     public void updateCameraOrientation();
 
     public void enableRecordingLocation(boolean enable);
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 176885ce4..4444e4d38 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -25,6 +25,7 @@ import android.content.Intent;
 import android.content.SharedPreferences.Editor;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
+import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Parameters;
@@ -140,9 +141,9 @@ public class PhotoModule
     private static final int UPDATE_PARAM_PREFERENCE = 4;
     private static final int UPDATE_PARAM_ALL = -1;
 
-    // This is the timeout to keep the camera in onPause for the first time
-    // after screen on if the activity is started from secure lock screen.
-    private static final int KEEP_CAMERA_TIMEOUT = 1000; // ms
+    // This is the delay before we execute onResume tasks when coming
+    // from the lock screen, to allow time for onPause to execute.
+    private static final int ON_RESUME_TASKS_DELAY_MSEC = 20;
 
     private static final String DEBUG_IMAGE_PREFIX = "DEBUG_";
 
@@ -297,6 +298,7 @@ public class PhotoModule
     private String mCurrTouchAfAec = Parameters.TOUCH_AF_AEC_ON;
 
     private final Handler mHandler = new MainHandler();
+
     private PreferenceGroup mPreferenceGroup;
 
     private boolean mQuickCapture;
@@ -343,6 +345,10 @@ public class PhotoModule
      * application
      */
     private class MainHandler extends Handler {
+        public MainHandler() {
+            super(Looper.getMainLooper());
+        }
+
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
@@ -576,6 +582,7 @@ public class PhotoModule
         mCameraDevice = CameraUtil.openCamera(
                 mActivity, mCameraId, mHandler,
                 mActivity.getCameraOpenErrorCallback());
+
         if (mCameraDevice == null) {
             Log.e(TAG, "Failed to open camera:" + mCameraId + ", aborting.");
             return;
@@ -624,6 +631,11 @@ public class PhotoModule
         if (mFocusManager != null) mFocusManager.setPreviewSize(width, height);
     }
 
+    @Override
+    public void onPreviewRectChanged(Rect previewRect) {
+        if (mFocusManager != null) mFocusManager.setPreviewRect(previewRect);
+    }
+
     private void resetExposureCompensation() {
         String value = mPreferences.getString(CameraSettings.KEY_EXPOSURE,
                 CameraSettings.EXPOSURE_DEFAULT_VALUE);
@@ -1216,6 +1228,7 @@ public class PhotoModule
         // is full then ignore.
         if (mCameraDevice == null || mCameraState == SNAPSHOT_IN_PROGRESS
                 || mCameraState == SWITCHING_CAMERA
+                || mActivity.getMediaSaveService() == null
                 || mActivity.getMediaSaveService().isQueueFull()) {
             return false;
         }
@@ -1295,7 +1308,9 @@ public class PhotoModule
             mFaceDetectionStarted = false;
         }
         UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
-                UsageStatistics.ACTION_CAPTURE_DONE, "Photo");
+                UsageStatistics.ACTION_CAPTURE_DONE, "Photo", 0,
+                UsageStatistics.hashFileName(mNamedImages.mQueue.lastElement().title + ".jpg"),
+                mParameters.flatten());
         return true;
     }
 
@@ -1616,14 +1631,10 @@ public class PhotoModule
         mPaused = false;
     }
 
-    /**
-     * Opens the camera device.
-     *
-     * @return Whether the camera was opened successfully.
-     */
     private boolean prepareCamera() {
         // We need to check whether the activity is paused before long
         // operations to ensure that onPause() can be done ASAP.
+        Log.v(TAG, "Open camera device.");
         mCameraDevice = CameraUtil.openCamera(
                 mActivity, mCameraId, mHandler,
                 mActivity.getCameraOpenErrorCallback());
@@ -1644,9 +1655,30 @@ public class PhotoModule
         return true;
     }
 
-
     @Override
     public void onResumeAfterSuper() {
+        // Add delay on resume from lock screen only, in order to to speed up
+        // the onResume --> onPause --> onResume cycle from lock screen.
+        // Don't do always because letting go of thread can cause delay.
+        String action = mActivity.getIntent().getAction();
+        if (MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA.equals(action)
+                || MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.equals(action)) {
+            Log.v(TAG, "On resume, from lock screen.");
+            // Note: onPauseAfterSuper() will delete this runnable, so we will
+            // at most have 1 copy queued up.
+            mHandler.postDelayed(new Runnable() {
+                public void run() {
+                    onResumeTasks();
+                }
+            }, ON_RESUME_TASKS_DELAY_MSEC);
+        } else {
+            Log.v(TAG, "On resume.");
+            onResumeTasks();
+        }
+    }
+
+    private void onResumeTasks() {
+        Log.v(TAG, "Executing onResumeTasks.");
         if (mOpenCameraFail || mCameraDisabled) return;
 
         mJpegPictureCallbackTime = 0;
@@ -1702,20 +1734,17 @@ public class PhotoModule
 
     @Override
     public void onPauseAfterSuper() {
-        // When camera is started from secure lock screen for the first time
-        // after screen on, the activity gets onCreate->onResume->onPause->onResume.
-        // To reduce the latency, keep the camera for a short time so it does
-        // not need to be opened again.
-        if (mCameraDevice != null && mActivity.isSecureCamera()
-                && CameraActivity.isFirstStartAfterScreenOn()) {
-            CameraActivity.resetFirstStartAfterScreenOn();
-            CameraHolder.instance().keep(KEEP_CAMERA_TIMEOUT);
-        }
+        Log.v(TAG, "On pause.");
+        mUI.showPreviewCover();
+
         // Reset the focus first. Camera CTS does not guarantee that
         // cancelAutoFocus is allowed after preview stops.
         if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) {
             mCameraDevice.cancelAutoFocus();
         }
+        // If the camera has not been opened asynchronously yet,
+        // and startPreview hasn't been called, then this is a no-op.
+        // (e.g. onResume -> onPause -> onResume).
         stopPreview();
 
         mNamedImages = null;
@@ -1931,11 +1960,19 @@ public class PhotoModule
     }
 
     private void closeCamera() {
+        Log.v(TAG, "Close camera device.");
         if (mCameraDevice != null) {
             mCameraDevice.setZoomChangeListener(null);
             mCameraDevice.setFaceDetectionCallback(null, null);
             mCameraDevice.setErrorCallback(null);
-            CameraHolder.instance().release();
+
+            if (mActivity.isSecureCamera() && !CameraActivity.isFirstStartAfterScreenOn()) {
+                // Blocks until camera is actually released.
+                CameraHolder.instance().strongRelease();
+            } else {
+                CameraHolder.instance().release();
+            }
+
             mFaceDetectionStarted = false;
             mCameraDevice = null;
             setCameraState(PREVIEW_STOPPED);
@@ -1963,26 +2000,31 @@ public class PhotoModule
         startPreview();
     }
 
-    // This can only be called by UI Thread.
+    /** This can run on a background thread, post any view updates to MainHandler. */
     private void startPreview() {
-        if (mPaused) {
+        if (mPaused || mCameraDevice == null) {
             return;
         }
+
+         // Any decisions we make based on the surface texture state
+         // need to be protected.
         SurfaceTexture st = mUI.getSurfaceTexture();
         if (st == null) {
             Log.w(TAG, "startPreview: surfaceTexture is not ready.");
             return;
         }
+
         if (!mCameraPreviewParamsReady) {
             Log.w(TAG, "startPreview: parameters for preview is not ready.");
             return;
         }
         mCameraDevice.setErrorCallback(mErrorCallback);
-
-        // ICS camera frameworks has a bug. Face detection state is not cleared
+        // ICS camera frameworks has a bug. Face detection state is not cleared 1589
         // after taking a picture. Stop the preview to work around it. The bug
         // was fixed in JB.
-        if (mCameraState != PREVIEW_STOPPED) stopPreview();
+        if (mCameraState != PREVIEW_STOPPED) {
+            stopPreview();
+        }
 
         setDisplayOrientation();
 
@@ -2436,6 +2478,11 @@ public class PhotoModule
             Log.v(TAG, "Preview Size changed. Restart Preview");
             mRestartPreview = true;
         }
+
+        if(optimalSize.width != 0 && optimalSize.height != 0) {
+            mUI.updatePreviewAspectRatio((float) optimalSize.width
+                    / (float) optimalSize.height);
+        }
         Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
 
         // Since changing scene mode may change supported values, set scene mode
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 66db1d08b..fb5853da2 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -23,6 +23,7 @@ import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Matrix;
+import android.graphics.RectF;
 import android.graphics.SurfaceTexture;
 import android.graphics.drawable.ColorDrawable;
 import android.hardware.Camera;
@@ -121,6 +122,8 @@ public class PhotoUI implements PieListener,
 
     private boolean mOrientationResize;
     private boolean mPrevOrientationResize;
+    private View mPreviewCover;
+    private final Object mSurfaceTextureLock = new Object();
 
     public interface SurfaceTextureSizeChangedListener {
         public void onSurfaceTextureSizeChanged(int uncroppedWidth, int uncroppedHeight);
@@ -162,11 +165,11 @@ public class PhotoUI implements PieListener,
             Bitmap bitmap = CameraUtil.downSample(mData, DOWN_SAMPLE_FACTOR);
             if ((mOrientation != 0 || mMirror) && (bitmap != null)) {
                 Matrix m = new Matrix();
-                m.preRotate(mOrientation);
                 if (mMirror) {
                     // Flip horizontally
                     m.setScale(-1f, 1f);
                 }
+                m.preRotate(mOrientation);
                 return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), m,
                         false);
             }
@@ -205,6 +208,7 @@ public class PhotoUI implements PieListener,
                 (ViewGroup) mRootView, true);
         mRenderOverlay = (RenderOverlay) mRootView.findViewById(R.id.render_overlay);
         mFlashOverlay = mRootView.findViewById(R.id.flash_overlay);
+        mPreviewCover = mRootView.findViewById(R.id.preview_cover);
         // display the view
         mTextureView = (TextureView) mRootView.findViewById(R.id.preview_content);
         mTextureView.setSurfaceTextureListener(this);
@@ -254,6 +258,24 @@ public class PhotoUI implements PieListener,
         mSurfaceTextureSizeListener = listener;
     }
 
+    public void updatePreviewAspectRatio(float aspectRatio) {
+        if (aspectRatio <= 0) {
+            Log.e(TAG, "Invalid aspect ratio: " + aspectRatio);
+            return;
+        }
+        if (aspectRatio < 1f) {
+            aspectRatio = 1f / aspectRatio;
+        }
+
+        if (mAspectRatio != aspectRatio) {
+            mAspectRatio = aspectRatio;
+            // Update transform matrix with the new aspect ratio.
+            if (mPreviewWidth != 0 && mPreviewHeight != 0) {
+                setTransformMatrix(mPreviewWidth, mPreviewHeight);
+            }
+        }
+    }
+
     private void setTransformMatrix(int width, int height) {
         mMatrix = mTextureView.getTransform(mMatrix);
         float scaleX = 1f, scaleY = 1f;
@@ -293,17 +315,28 @@ public class PhotoUI implements PieListener,
         scaleY = scaledTextureHeight / height;
         mMatrix.setScale(scaleX, scaleY, (float) width / 2, (float) height / 2);
         mTextureView.setTransform(mMatrix);
+
+        // Calculate the new preview rectangle.
+        RectF previewRect = new RectF(0, 0, width, height);
+        mMatrix.mapRect(previewRect);
+        mController.onPreviewRectChanged(CameraUtil.rectFToRect(previewRect));
+    }
+
+    protected Object getSurfaceTextureLock() {
+        return mSurfaceTextureLock;
     }
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        Log.v(TAG, "SurfaceTexture ready.");
-        mSurfaceTexture = surface;
-        mController.onPreviewUIReady();
-        // Workaround for b/11168275, see b/10981460 for more details
-        if (mPreviewWidth != 0 && mPreviewHeight != 0) {
-            // Re-apply transform matrix for new surface texture
-            setTransformMatrix(mPreviewWidth, mPreviewHeight);
+        synchronized (mSurfaceTextureLock) {
+            Log.v(TAG, "SurfaceTexture ready.");
+            mSurfaceTexture = surface;
+            mController.onPreviewUIReady();
+            // Workaround for b/11168275, see b/10981460 for more details
+            if (mPreviewWidth != 0 && mPreviewHeight != 0) {
+                // Re-apply transform matrix for new surface texture
+                setTransformMatrix(mPreviewWidth, mPreviewHeight);
+            }
         }
     }
 
@@ -314,15 +347,20 @@ public class PhotoUI implements PieListener,
 
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        mSurfaceTexture = null;
-        mController.onPreviewUIDestroyed();
-        Log.w(TAG, "SurfaceTexture destroyed");
-        return true;
+        synchronized (mSurfaceTextureLock) {
+            mSurfaceTexture = null;
+            mController.onPreviewUIDestroyed();
+            Log.w(TAG, "SurfaceTexture destroyed");
+            return true;
+        }
     }
 
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        // Do nothing.
+        // Make sure preview cover is hidden if preview data is available.
+        if (mPreviewCover.getVisibility() != View.GONE) {
+            mPreviewCover.setVisibility(View.GONE);
+        }
     }
 
     public View getRootView() {
@@ -752,6 +790,8 @@ public class PhotoUI implements PieListener,
         if (mFaceView != null) {
             mFaceView.setBlockDraw(true);
         }
+        // Close module selection menu when pie menu is opened.
+        mSwitcher.closePopup();
     }
 
     @Override
@@ -802,6 +842,10 @@ public class PhotoUI implements PieListener,
         mNotSelectableToast.show();
     }
 
+    public void showPreviewCover() {
+        mPreviewCover.setVisibility(View.VISIBLE);
+    }
+
     public void onPause() {
         cancelCountDown();
 
diff --git a/src/com/android/camera/Storage.java b/src/com/android/camera/Storage.java
index 49435e4c0..29dad8aa4 100644
--- a/src/com/android/camera/Storage.java
+++ b/src/com/android/camera/Storage.java
@@ -44,6 +44,7 @@ public class Storage {
 
     public static final String DIRECTORY = DCIM + "/Camera";
     public static final String RAW_DIRECTORY = DCIM + "/Camera/raw";
+    public static final String JPEG_POSTFIX = ".jpg";
 
     // Match the code in MediaProvider.computeBucketValues().
     public static final String BUCKET_ID =
@@ -63,6 +64,24 @@ public class Storage {
         }
     }
 
+    public static void writeFile(String path, byte[] jpeg, ExifInterface exif,
+            String mimeType) {
+        if (exif != null && (mimeType == null ||
+            mimeType.equalsIgnoreCase("jpeg"))) {
+            try {
+                exif.writeExif(jpeg, path);
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to write data", e);
+            }
+        } else if (jpeg != null) {
+            if (!(mimeType.equalsIgnoreCase("jpeg") || mimeType == null)) {
+                 File dir = new File(RAW_DIRECTORY);
+                 dir.mkdirs();
+            }
+            writeFile(path, jpeg);
+        }
+    }
+
     public static void writeFile(String path, byte[] data) {
         FileOutputStream out = null;
         try {
@@ -74,48 +93,30 @@ public class Storage {
             try {
                 out.close();
             } catch (Exception e) {
+                Log.e(TAG, "Failed to close file after write", e);
             }
         }
     }
 
-    // Save the image and add it to media store.
-    public static Uri addImage(ContentResolver resolver, String title,
-            long date, Location location, int orientation, ExifInterface exif,
-            byte[] jpeg, int width, int height, String pictureFormat) {
-        int jpegLength = 0;
-
-        if (jpeg != null) {
-            jpegLength = jpeg.length;
-        }
+    // Save the image with a given mimeType and add it the MediaStore.
+    public static Uri addImage(ContentResolver resolver, String title, long date,
+            Location location, int orientation, ExifInterface exif, byte[] jpeg, int width,
+            int height, String mimeType) {
 
-        // Save the image.
-        String path = generateFilepath(title, pictureFormat);
-        if (exif != null && (pictureFormat == null ||
-            pictureFormat.equalsIgnoreCase("jpeg"))) {
-            try {
-                exif.writeExif(jpeg, path);
-            } catch (Exception e) {
-                Log.e(TAG, "Failed to write data", e);
-            }
-        } else if (jpeg != null) {
-            if (!(pictureFormat.equalsIgnoreCase("jpeg") || pictureFormat == null)) {
-                 File dir = new File(RAW_DIRECTORY);
-                 dir.mkdirs();
-            }
-            writeFile(path, jpeg);
-        }
+        String path = generateFilepath(title, mimeType);
+        writeFile(path, jpeg, exif, mimeType);
         return addImage(resolver, title, date, location, orientation,
-                jpegLength, path, width, height, pictureFormat);
+                jpeg.length, path, width, height, mimeType);
     }
 
-    // Add the image to media store.
-    public static Uri addImage(ContentResolver resolver, String title,
+    // Get a ContentValues object for the given photo data
+    public static ContentValues getContentValuesForData(String title,
             long date, Location location, int orientation, int jpegLength,
-            String path, int width, int height, String pictureFormat) {
+            String path, int width, int height, String mimeType) {
         // Insert into MediaStore.
         ContentValues values = new ContentValues(9);
         values.put(ImageColumns.TITLE, title);
-        if (pictureFormat.equalsIgnoreCase("jpeg") || pictureFormat == null) {
+        if (mimeType.equalsIgnoreCase("jpeg") || mimeType == null) {
             values.put(ImageColumns.DISPLAY_NAME, title + ".jpg");
         } else {
             values.put(ImageColumns.DISPLAY_NAME, title + ".raw");
@@ -133,19 +134,54 @@ public class Storage {
             values.put(ImageColumns.LATITUDE, location.getLatitude());
             values.put(ImageColumns.LONGITUDE, location.getLongitude());
         }
+        return values;
+    }
 
-        Uri uri = null;
-        try {
-            uri = resolver.insert(Images.Media.EXTERNAL_CONTENT_URI, values);
-        } catch (Throwable th)  {
-            // This can happen when the external volume is already mounted, but
-            // MediaScanner has not notify MediaProvider to add that volume.
-            // The picture is still safe and MediaScanner will find it and
-            // insert it into MediaProvider. The only problem is that the user
-            // cannot click the thumbnail to review the picture.
-            Log.e(TAG, "Failed to write MediaStore" + th);
+    // Add the image to media store.
+    public static Uri addImage(ContentResolver resolver, String title,
+            long date, Location location, int orientation, int jpegLength,
+            String path, int width, int height, String mimeType) {
+        // Insert into MediaStore.
+        ContentValues values =
+                getContentValuesForData(title, date, location, orientation, jpegLength, path,
+                        width, height, mimeType);
+
+         return insertImage(resolver, values);
+    }
+
+    // Overwrites the file and updates the MediaStore, or inserts the image if
+    // one does not already exist.
+    public static void updateImage(Uri imageUri, ContentResolver resolver, String title, long date,
+            Location location, int orientation, ExifInterface exif, byte[] jpeg, int width,
+            int height, String mimeType) {
+        String path = generateFilepath(title, mimeType);
+        writeFile(path, jpeg, exif, mimeType);
+        updateImage(imageUri, resolver, title, date, location, orientation, jpeg.length, path,
+                width, height, mimeType);
+    }
+
+    // Updates the image values in MediaStore, or inserts the image if one does
+    // not already exist.
+    public static void updateImage(Uri imageUri, ContentResolver resolver, String title,
+            long date, Location location, int orientation, int jpegLength,
+            String path, int width, int height, String mimeType) {
+
+        ContentValues values =
+                getContentValuesForData(title, date, location, orientation, jpegLength, path,
+                        width, height, mimeType);
+
+        // Update the MediaStore
+        int rowsModified = resolver.update(imageUri, values, null, null);
+
+        if (rowsModified == 0) {
+            // If no prior row existed, insert a new one.
+            Log.w(TAG, "updateImage called with no prior image at uri: " + imageUri);
+            insertImage(resolver, values);
+        } else if (rowsModified != 1) {
+            // This should never happen
+            throw new IllegalStateException("Bad number of rows (" + rowsModified
+                    + ") updated for uri: " + imageUri);
         }
-        return uri;
     }
 
     public static void deleteImage(ContentResolver resolver, Uri uri) {
@@ -199,4 +235,19 @@ public class Storage {
             Log.e(TAG, "Failed to create " + nnnAAAAA.getPath());
         }
     }
+
+    private static Uri insertImage(ContentResolver resolver, ContentValues values) {
+        Uri uri = null;
+        try {
+            uri = resolver.insert(Images.Media.EXTERNAL_CONTENT_URI, values);
+        } catch (Throwable th)  {
+            // This can happen when the external volume is already mounted, but
+            // MediaScanner has not notify MediaProvider to add that volume.
+            // The picture is still safe and MediaScanner will find it and
+            // insert it into MediaProvider. The only problem is that the user
+            // cannot click the thumbnail to review the picture.
+            Log.e(TAG, "Failed to write MediaStore" + th);
+        }
+        return uri;
+    }
 }
diff --git a/src/com/android/camera/SurfaceTextureRenderer.java b/src/com/android/camera/SurfaceTextureRenderer.java
index 66f7aa219..331504393 100644
--- a/src/com/android/camera/SurfaceTextureRenderer.java
+++ b/src/com/android/camera/SurfaceTextureRenderer.java
@@ -51,8 +51,10 @@ public class SurfaceTextureRenderer {
         @Override
         public void run() {
             synchronized (mRenderLock) {
-                mFrameDrawer.onDrawFrame(mGl);
-                mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
+                if (mEglDisplay != null && mEglSurface != null) {
+                    mFrameDrawer.onDrawFrame(mGl);
+                    mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
+                }
                 mRenderLock.notifyAll();
             }
         }
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 057332b09..f8f416786 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -965,6 +965,7 @@ public class VideoModule implements CameraModule,
     public void onPauseBeforeSuper() {
         mPaused = true;
 
+        mUI.showPreviewCover();
         if (mMediaRecorderRecording) {
             // Camera will be released in onStopVideoRecording.
             onStopVideoRecording();
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 7547bdd87..bb270b7f8 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -96,6 +96,7 @@ public class VideoUI implements PieRenderer.PieListener,
     private boolean mOrientationResize;
     private boolean mPrevOrientationResize;
 
+    private View mPreviewCover;
     private SurfaceView mSurfaceView = null;
     private int mPreviewWidth = 0;
     private int mPreviewHeight = 0;
@@ -141,6 +142,10 @@ public class VideoUI implements PieRenderer.PieListener,
         }
     };
 
+    public void showPreviewCover() {
+        mPreviewCover.setVisibility(View.VISIBLE);
+    }
+
     private class SettingsPopup extends PopupWindow {
         public SettingsPopup(View popup) {
             super(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
@@ -175,6 +180,7 @@ public class VideoUI implements PieRenderer.PieListener,
         mController = controller;
         mRootView = parent;
         mActivity.getLayoutInflater().inflate(R.layout.video_module, (ViewGroup) mRootView, true);
+        mPreviewCover = mRootView.findViewById(R.id.preview_cover);
         mTextureView = (TextureView) mRootView.findViewById(R.id.preview_content);
         mTextureView.setSurfaceTextureListener(this);
         mTextureView.addOnLayoutChangeListener(mLayoutListener);
@@ -592,6 +598,8 @@ public class VideoUI implements PieRenderer.PieListener,
     @Override
     public void onPieOpened(int centerX, int centerY) {
         setSwipingEnabled(false);
+        // Close module selection menu when pie menu is opened.
+        mSwitcher.closePopup();
     }
 
     @Override
@@ -781,6 +789,10 @@ public class VideoUI implements PieRenderer.PieListener,
 
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        // Make sure preview cover is hidden if preview data is available.
+        if (mPreviewCover.getVisibility() != View.GONE) {
+            mPreviewCover.setVisibility(View.GONE);
+        }
     }
 
     // SurfaceHolder callbacks
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index c4080df4c..85f983ea8 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -46,6 +46,7 @@ import android.view.WindowManager;
 import com.android.camera.PhotoModule;
 import com.android.camera.CameraManager.CameraProxy;
 import com.android.camera.app.OrientationManager;
+import com.android.camera.data.LocalData;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.UsageStatistics;
@@ -745,12 +746,12 @@ public class WideAnglePanoramaModule
     }
 
     private void resetToPreviewIfPossible() {
+        reset();
         if (!mMosaicFrameProcessorInitialized
                 || mUI.getSurfaceTexture() == null
                 || !mMosaicPreviewConfigured) {
             return;
         }
-        reset();
         if (!mPaused) {
             startCameraPreview();
         }
@@ -767,6 +768,10 @@ public class WideAnglePanoramaModule
             String filepath = Storage.generateFilepath(filename,
                               PhotoModule.PIXEL_FORMAT_JPEG);
 
+            UsageStatistics.onEvent(UsageStatistics.COMPONENT_PANORAMA,
+                    UsageStatistics.ACTION_CAPTURE_DONE, null, 0,
+                    UsageStatistics.hashFileName(filename + ".jpg"));
+
             Location loc = mLocationManager.getCurrentLocation();
             ExifInterface exif = new ExifInterface();
             try {
@@ -783,9 +788,8 @@ public class WideAnglePanoramaModule
                 Storage.writeFile(filepath, jpegData);
             }
             int jpegLength = (int) (new File(filepath).length());
-            return Storage.addImage(mContentResolver, filename, mTimeTaken,
-                    loc, orientation, jpegLength, filepath, width, height,
-                    PhotoModule.PIXEL_FORMAT_JPEG);
+            return Storage.addImage(mContentResolver, filename, mTimeTaken, loc, orientation,
+                    jpegLength, filepath, width, height, LocalData.MIME_TYPE_JPEG);
         }
         return null;
     }
@@ -837,7 +841,7 @@ public class WideAnglePanoramaModule
             stopCapture(true);
             reset();
         }
-
+        mUI.showPreviewCover();
         releaseCamera();
         synchronized (mRendererLock) {
             mCameraTexture = null;
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 02ce5516f..2cf27576d 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -89,6 +89,7 @@ public class WideAnglePanoramaUI implements
     private int mIndicatorColorFast;
     private int mReviewBackground;
     private SurfaceTexture mSurfaceTexture;
+    private View mPreviewCover;
 
     /** Constructor. */
     public WideAnglePanoramaUI(
@@ -243,6 +244,10 @@ public class WideAnglePanoramaUI implements
 
     @Override
     public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+        // Make sure preview cover is hidden if preview data is available.
+        if (mPreviewCover.getVisibility() != View.GONE) {
+            mPreviewCover.setVisibility(View.GONE);
+        }
     }
 
     private void hideDirectionIndicators() {
@@ -349,6 +354,7 @@ public class WideAnglePanoramaUI implements
         mReviewBackground = appRes.getColor(R.color.review_background);
         mIndicatorColorFast = appRes.getColor(R.color.pano_progress_indication_fast);
 
+        mPreviewCover = mRootView.findViewById(R.id.preview_cover);
         mPreviewLayout = mRootView.findViewById(R.id.pano_preview_layout);
         mReviewControl = (ViewGroup) mRootView.findViewById(R.id.pano_review_control);
         mReviewLayout = mRootView.findViewById(R.id.pano_review_layout);
@@ -461,6 +467,10 @@ public class WideAnglePanoramaUI implements
         ((CameraRootView) mRootView).removeDisplayChangeListener();
     }
 
+    public void showPreviewCover() {
+        mPreviewCover.setVisibility(View.VISIBLE);
+    }
+
     private class DialogHelper {
         private ProgressDialog mProgressDialog;
         private AlertDialog mAlertDialog;
diff --git a/src/com/android/camera/app/AppManagerFactory.java b/src/com/android/camera/app/AppManagerFactory.java
index 9c047aa55..43d2a00cd 100644
--- a/src/com/android/camera/app/AppManagerFactory.java
+++ b/src/com/android/camera/app/AppManagerFactory.java
@@ -16,9 +16,9 @@
 
 package com.android.camera.app;
 
-import android.app.Application;
 import android.content.Context;
 
+
 /**
  * A singleton class which provides application level utility
  * classes.
@@ -35,13 +35,19 @@ public class AppManagerFactory {
     }
 
     private PanoramaStitchingManager mPanoramaStitchingManager;
+    private PlaceholderManager mGcamProcessingManager;
 
     /** No public constructor. */
     private AppManagerFactory(Context ctx) {
         mPanoramaStitchingManager = new PanoramaStitchingManager(ctx);
+        mGcamProcessingManager = new PlaceholderManager(ctx);
     }
 
     public PanoramaStitchingManager getPanoramaStitchingManager() {
         return mPanoramaStitchingManager;
     }
+
+    public PlaceholderManager getGcamProcessingManager() {
+        return mGcamProcessingManager;
+    }
 }
diff --git a/src/com/android/camera/app/PlaceholderManager.java b/src/com/android/camera/app/PlaceholderManager.java
new file mode 100644
index 000000000..326f0be80
--- /dev/null
+++ b/src/com/android/camera/app/PlaceholderManager.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package com.android.camera.app;
+
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.location.Location;
+import android.net.Uri;
+
+import com.android.camera.ImageTaskManager;
+import com.android.camera.Storage;
+import com.android.camera.exif.ExifInterface;
+import com.android.camera.util.CameraUtil;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class PlaceholderManager implements ImageTaskManager {
+    private static final String TAG = "PlaceholderManager";
+
+    public static final String PLACEHOLDER_MIME_TYPE = "application/placeholder-image";
+    private final Context mContext;
+
+    final private ArrayList<WeakReference<TaskListener>> mListenerRefs;
+
+    public static class Session {
+        String outputTitle;
+        Uri outputUri;
+        long time;
+
+        Session(String title, Uri uri, long timestamp) {
+            outputTitle = title;
+            outputUri = uri;
+            time = timestamp;
+        }
+    }
+
+    public PlaceholderManager(Context context) {
+        mContext = context;
+        mListenerRefs = new ArrayList<WeakReference<TaskListener>>();
+    }
+
+    @Override
+    public void addTaskListener(TaskListener l) {
+        synchronized (mListenerRefs) {
+            if (findTaskListener(l) == -1) {
+                mListenerRefs.add(new WeakReference<TaskListener>(l));
+            }
+        }
+    }
+
+    @Override
+    public void removeTaskListener(TaskListener l) {
+        synchronized (mListenerRefs) {
+            int i = findTaskListener(l);
+            if (i != -1) {
+                mListenerRefs.remove(i);
+            }
+        }
+    }
+
+    @Override
+    public int getTaskProgress(Uri uri) {
+        return 0;
+    }
+
+    private int findTaskListener(TaskListener listener) {
+        int index = -1;
+        for (int i = 0; i < mListenerRefs.size(); i++) {
+            TaskListener l = mListenerRefs.get(i).get();
+            if (l != null && l == listener) {
+                index = i;
+                break;
+            }
+        }
+        return index;
+    }
+
+    private Iterable<TaskListener> getListeners() {
+        return new Iterable<TaskListener>() {
+            @Override
+            public Iterator<TaskListener> iterator() {
+                return new ListenerIterator();
+            }
+        };
+    }
+
+    private class ListenerIterator implements Iterator<TaskListener> {
+        private int mIndex = 0;
+        private TaskListener mNext = null;
+
+        @Override
+        public boolean hasNext() {
+            while (mNext == null && mIndex < mListenerRefs.size()) {
+                mNext = mListenerRefs.get(mIndex).get();
+                if (mNext == null) {
+                    mListenerRefs.remove(mIndex);
+                }
+            }
+            return mNext != null;
+        }
+
+        @Override
+        public TaskListener next() {
+            hasNext(); // Populates mNext
+            mIndex++;
+            TaskListener next = mNext;
+            mNext = null;
+            return next;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    public Session insertPlaceholder(String title, byte[] placeholder, long timestamp) {
+        if (title == null || placeholder == null) {
+            throw new IllegalArgumentException("Null argument passed to insertPlaceholder");
+        }
+
+        // Decode bounds
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeByteArray(placeholder, 0, placeholder.length, options);
+        int width = options.outWidth;
+        int height = options.outHeight;
+
+        if (width <= 0 || height <= 0) {
+            throw new IllegalArgumentException("Image had bad height/width");
+        }
+
+        Uri uri =
+                Storage.addImage(mContext.getContentResolver(), title, timestamp, null, 0, null,
+                        placeholder, width, height, PLACEHOLDER_MIME_TYPE);
+
+        if (uri == null) {
+            return null;
+        }
+
+        String filePath = uri.getPath();
+        synchronized (mListenerRefs) {
+            for (TaskListener l : getListeners()) {
+                l.onTaskQueued(filePath, uri);
+            }
+        }
+
+        return new Session(title, uri, timestamp);
+    }
+
+    public void replacePlaceholder(Session session, Location location, int orientation,
+            ExifInterface exif, byte[] jpeg, int width, int height, String mimeType) {
+
+        Storage.updateImage(session.outputUri, mContext.getContentResolver(), session.outputTitle,
+                session.time, location, orientation, exif, jpeg, width, height, mimeType);
+
+        synchronized (mListenerRefs) {
+            for (TaskListener l : getListeners()) {
+                l.onTaskDone(session.outputUri.getPath(), session.outputUri);
+            }
+        }
+        CameraUtil.broadcastNewPicture(mContext, session.outputUri);
+    }
+
+    public void removePlaceholder(Session session) {
+        Storage.deleteImage(mContext.getContentResolver(), session.outputUri);
+    }
+
+}
diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index f59b2099c..99bde4181 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -28,6 +28,7 @@ import android.util.Log;
 import android.view.View;
 
 import com.android.camera.Storage;
+import com.android.camera.app.PlaceholderManager;
 import com.android.camera.ui.FilmStripView.ImageData;
 
 import java.util.ArrayList;
@@ -285,7 +286,11 @@ public class CameraDataAdapter implements LocalDataAdapter {
                 while (true) {
                     LocalData data = LocalMediaData.PhotoData.buildFromCursor(c);
                     if (data != null) {
-                        l.add(data);
+                        if (data.getMimeType().equals(PlaceholderManager.PLACEHOLDER_MIME_TYPE)) {
+                            l.add(new InProgressDataWrapper(data, true));
+                        } else {
+                            l.add(data);
+                        }
                     } else {
                         Log.e(TAG, "Error loading data:"
                                 + c.getString(LocalMediaData.PhotoData.COL_DATA));
diff --git a/src/com/android/camera/data/InProgressDataWrapper.java b/src/com/android/camera/data/InProgressDataWrapper.java
index 7de617bae..61e87b722 100644
--- a/src/com/android/camera/data/InProgressDataWrapper.java
+++ b/src/com/android/camera/data/InProgressDataWrapper.java
@@ -22,8 +22,10 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.view.View;
+import android.widget.FrameLayout;
 
 import com.android.camera.util.PhotoSphereHelper;
+import com.android.camera2.R;
 
 /**
  * A wrapper class for in-progress data. Data that's still being processed
@@ -34,16 +36,34 @@ import com.android.camera.util.PhotoSphereHelper;
 public class InProgressDataWrapper implements LocalData {
 
     final LocalData mLocalData;
+    private boolean mHasProgressBar;
 
     public InProgressDataWrapper(LocalData wrappedData) {
         mLocalData = wrappedData;
     }
 
+    public InProgressDataWrapper(LocalData wrappedData, boolean hasProgressBar) {
+        this(wrappedData);
+        mHasProgressBar = hasProgressBar;
+    }
+
     @Override
     public View getView(
             Activity a, int width, int height,
             Drawable placeHolder, LocalDataAdapter adapter) {
-        return mLocalData.getView(a, width, height, placeHolder, adapter);
+        View v =  mLocalData.getView(a, width, height, placeHolder, adapter);
+
+        if (mHasProgressBar) {
+            // Return a framelayout with the progressbar and imageview.
+            FrameLayout frame = new FrameLayout(a);
+            frame.setLayoutParams(new FrameLayout.LayoutParams(width, height));
+            frame.addView(v);
+            a.getLayoutInflater()
+                    .inflate(R.layout.placeholder_progressbar, frame);
+            return frame;
+        }
+
+        return v;
     }
 
     @Override
diff --git a/src/com/android/camera/ui/CameraRootView.java b/src/com/android/camera/ui/CameraRootView.java
index 505549c80..daaefc027 100644
--- a/src/com/android/camera/ui/CameraRootView.java
+++ b/src/com/android/camera/ui/CameraRootView.java
@@ -37,7 +37,7 @@ public class CameraRootView extends FrameLayout {
     private int mBottomMargin = 0;
     private int mLeftMargin = 0;
     private int mRightMargin = 0;
-    private Rect mCurrentInsets;
+    private final Rect mCurrentInsets = new Rect(0, 0, 0, 0);
     private int mOffset = 0;
     private Object mDisplayListener;
     private MyDisplayListener mListener;
@@ -53,19 +53,24 @@ public class CameraRootView extends FrameLayout {
 
     @Override
     protected boolean fitSystemWindows(Rect insets) {
-        mCurrentInsets = insets;
         // insets include status bar, navigation bar, etc
         // In this case, we are only concerned with the size of nav bar
-        if (mOffset > 0) {
-            return true;
+        if (mCurrentInsets.equals(insets)) {
+            // Local copy of the insets is up to date. No need to do anything.
+            return false;
         }
 
-        if (insets.bottom > 0) {
-            mOffset = insets.bottom;
-        } else if (insets.right > 0) {
-            mOffset = insets.right;
+        if (mOffset == 0) {
+            if (insets.bottom > 0) {
+                mOffset = insets.bottom;
+            } else if (insets.right > 0) {
+                mOffset = insets.right;
+            }
         }
-        return true;
+        mCurrentInsets.set(insets);
+        // Make sure onMeasure will be called to adapt to the new insets.
+        requestLayout();
+        return false;
     }
 
     public void initDisplayListener() {
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 9945952ee..89da0184e 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -43,6 +43,7 @@ import com.android.camera.ui.FilmStripView.ImageData.PanoramaSupportCallback;
 import com.android.camera.ui.FilmstripBottomControls.BottomControlsListener;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.PhotoSphereHelper.PanoramaViewHelper;
+import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 
 import java.util.Arrays;
@@ -1453,6 +1454,13 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
         mController.setSurroundingViewsVisible(true);
     }
 
+    private void hideZoomView() {
+        if (mController.isZoomStarted()) {
+            mController.cancelLoadingZoomedImage();
+            mZoomView.setVisibility(GONE);
+        }
+    }
+
     // Keeps the view in the view hierarchy if it's camera preview.
     // Remove from the hierarchy otherwise.
     private void checkForRemoval(ImageData data, View v) {
@@ -1785,6 +1793,8 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
                     && deltaX < mSlop * (-1)) {
                 // intercept left swipe
                 if (Math.abs(deltaX) >= Math.abs(deltaY) * 2) {
+                    UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                            UsageStatistics.ACTION_FILMSTRIP, null);
                     return true;
                 }
             }
@@ -1908,10 +1918,19 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
         mController.stopScrolling(true);
         mController.stopScale();
         mDataIdOnUserScrolling = 0;
-        // Remove all views from the mViewItem buffer, except the camera view.
+        // Reload has a side effect that after this call, it will show the
+        // camera preview. So we want to know whether it starts from the camera
+        // preview to decide whether we need to call onDataFocusChanged.
+        boolean stayInPreview = false;
+
         if (mListener != null && mViewItem[mCurrentItem] != null) {
-            mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), false);
+            stayInPreview = mViewItem[mCurrentItem].getId() == 0;
+            if (!stayInPreview) {
+                mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), false);
+            }
         }
+
+        // Remove all views from the mViewItem buffer, except the camera view.
         for (int i = 0; i < mViewItem.length; i++) {
             if (mViewItem[i] == null) {
                 continue;
@@ -1920,8 +1939,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             if (v != mCameraView) {
                 removeView(v);
             }
-            if (mDataAdapter.getImageData(mViewItem[i].getId()) != null) {
-                mDataAdapter.getImageData(mViewItem[i].getId()).recycle();
+            ImageData imageData = mDataAdapter.getImageData(mViewItem[i].getId());
+            if (imageData != null) {
+                imageData.recycle();
             }
         }
 
@@ -1954,7 +1974,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
 
         if (mListener != null) {
             mListener.onReload();
-            mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), true);
+            if (!stayInPreview) {
+                mListener.onDataFocusChanged(mViewItem[mCurrentItem].getId(), true);
+            }
         }
     }
 
@@ -2625,13 +2647,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             if (!mController.stopScrolling(false)) {
                 return false;
             }
-            // A down event is usually followed by a gesture, we apply gesture on
-            // the lower-res image during a gesture to ensure a responsive experience.
-            // TODO: Delay this until gesture starts.
-            if (mController.isZoomStarted()) {
-                mController.cancelLoadingZoomedImage();
-                mZoomView.setVisibility(GONE);
-            }
+
             return true;
         }
 
@@ -2712,12 +2728,16 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
 
         @Override
         public boolean onScroll(float x, float y, float dx, float dy) {
-            if (mViewItem[mCurrentItem] == null) {
+            ViewItem currItem = mViewItem[mCurrentItem];
+            if (currItem == null) {
                 return false;
             }
+            if (!mDataAdapter.canSwipeInFullScreen(currItem.getId())) {
+                return false;
+            }
+            hideZoomView();
             // When image is zoomed in to be bigger than the screen
             if (mController.isZoomStarted()) {
-                mController.cancelLoadingZoomedImage();
                 ViewItem curr = mViewItem[mCurrentItem];
                 float transX = curr.getTranslationX() - dx;
                 float transY = curr.getTranslationY() - dy;
@@ -2777,6 +2797,9 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             if (currItem == null) {
                 return false;
             }
+            if (!mDataAdapter.canSwipeInFullScreen(currItem.getId())) {
+                return false;
+            }
             if (mController.isZoomStarted()) {
                 // Fling within the zoomed image
                 mController.flingInsideZoomView(velocityX, velocityY);
@@ -2837,6 +2860,8 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
             if (inCameraFullscreen()) {
                 return false;
             }
+
+            hideZoomView();
             mScaleTrend = 1f;
             // If the image is smaller than screen size, we should allow to zoom
             // in to full screen size
diff --git a/src/com/android/camera/ui/PieRenderer.java b/src/com/android/camera/ui/PieRenderer.java
index 008bc40ca..0039aa22c 100644
--- a/src/com/android/camera/ui/PieRenderer.java
+++ b/src/com/android/camera/ui/PieRenderer.java
@@ -16,9 +16,6 @@
 
 package com.android.camera.ui;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
 import android.animation.ValueAnimator;
@@ -40,12 +37,19 @@ import android.view.animation.Animation;
 import android.view.animation.Transformation;
 
 import com.android.camera.drawable.TextDrawable;
+import com.android.camera.ui.ProgressRenderer.VisibilityListener;
 import com.android.camera2.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * An overlay renderer that is used to display focus state and progress state.
+ */
 public class PieRenderer extends OverlayRenderer
         implements FocusIndicator {
 
-    private static final String TAG = "CAM Pie";
+    private static final String TAG = "PieRenderer";
 
     // Sometimes continuous autofocus starts and stops several times quickly.
     // These states are used to make sure the animation is run for at least some
@@ -143,7 +147,7 @@ public class PieRenderer extends OverlayRenderer
     private int mAngleZone;
     private float mCenterAngle;
 
-
+    private ProgressRenderer mProgressRenderer;
 
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -227,6 +231,7 @@ public class PieRenderer extends OverlayRenderer
         mLabel.setDropShadow(true);
         mDeadZone = res.getDimensionPixelSize(R.dimen.pie_deadzone_width);
         mAngleZone = res.getDimensionPixelSize(R.dimen.pie_anglezone_width);
+        mProgressRenderer = new ProgressRenderer(ctx);
     }
 
     private PieItem getRoot() {
@@ -309,6 +314,10 @@ public class PieRenderer extends OverlayRenderer
         return mState == STATE_PIE && isVisible();
     }
 
+    public void setProgress(int percent) {
+        mProgressRenderer.setProgress(percent);
+    }
+
     private void fadeIn() {
         mFadeIn = new ValueAnimator();
         mFadeIn.setFloatValues(0f, 1f);
@@ -524,6 +533,8 @@ public class PieRenderer extends OverlayRenderer
 
     @Override
     public void onDraw(Canvas canvas) {
+        mProgressRenderer.onDraw(canvas, mFocusX, mFocusY);
+
         float alpha = 1;
         if (mXFade != null) {
             alpha = (Float) mXFade.getAnimatedValue();
@@ -706,6 +717,11 @@ public class PieRenderer extends OverlayRenderer
         return false;
     }
 
+    @Override
+    public boolean isVisible() {
+        return super.isVisible() || mProgressRenderer.isVisible();
+    }
+
     private boolean pulledToCenter(PointF polarCoords) {
         return polarCoords.y < mArcRadius - mRadiusInc;
     }
@@ -918,17 +934,6 @@ public class PieRenderer extends OverlayRenderer
         setCircle(mFocusX, mFocusY);
     }
 
-    public void alignFocus(int x, int y) {
-        mOverlay.removeCallbacks(mDisappear);
-        mAnimation.cancel();
-        mAnimation.reset();
-        mFocusX = x;
-        mFocusY = y;
-        mDialAngle = DIAL_HORIZONTAL;
-        setCircle(x, y);
-        mFocused = false;
-    }
-
     public int getSize() {
         return 2 * mCircleSize;
     }
@@ -1022,11 +1027,27 @@ public class PieRenderer extends OverlayRenderer
         mState = STATE_IDLE;
     }
 
+    public void clear(boolean waitUntilProgressIsHidden) {
+        if (mState == STATE_PIE)
+            return;
+        cancelFocus();
+
+        if (waitUntilProgressIsHidden) {
+            mProgressRenderer.setVisibilityListener(new VisibilityListener() {
+                @Override
+                public void onHidden() {
+                    mOverlay.post(mDisappear);
+                }
+            });
+        } else {
+            mOverlay.post(mDisappear);
+            mProgressRenderer.setVisibilityListener(null);
+        }
+    }
+
     @Override
     public void clear() {
-        if (mState == STATE_PIE) return;
-        cancelFocus();
-        mOverlay.post(mDisappear);
+        clear(false);
     }
 
     private void startAnimation(long duration, boolean timeout,
diff --git a/src/com/android/camera/ui/ProgressRenderer.java b/src/com/android/camera/ui/ProgressRenderer.java
new file mode 100644
index 000000000..500293133
--- /dev/null
+++ b/src/com/android/camera/ui/ProgressRenderer.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2013 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.
+ */
+
+package com.android.camera.ui;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+
+import com.android.camera2.R;
+
+/**
+ * Renders a circular progress bar on the screen.
+ */
+public class ProgressRenderer {
+
+    public static interface VisibilityListener {
+        public void onHidden();
+    }
+
+    private final int mProgressRadius;
+    private final Paint mProgressBasePaint;
+    private final Paint mProgressPaint;
+
+    private RectF mArcBounds = new RectF(0, 0, 1, 1);
+    private int mProgressAngleDegrees = 270;
+    private boolean mVisible = false;
+    private VisibilityListener mVisibilityListener;
+
+    /**
+     * After we reach 100%, keep on painting the progress for another x milliseconds
+     * before hiding it.
+     */
+    private static final int SHOW_PROGRESS_X_ADDITIONAL_MS = 100;
+
+    /** When to hide the progress indicator. */
+    private long mTimeToHide = 0;
+
+    public ProgressRenderer(Context context) {
+        mProgressRadius = context.getResources().getDimensionPixelSize(R.dimen.pie_progress_radius);
+        int pieProgressWidth = context.getResources().getDimensionPixelSize(
+                R.dimen.pie_progress_width);
+        mProgressBasePaint = createProgressPaint(pieProgressWidth, 0.2f);
+        mProgressPaint = createProgressPaint(pieProgressWidth, 1.0f);
+    }
+
+    /**
+     * Sets or replaces a visiblity listener.
+     */
+    public void setVisibilityListener(VisibilityListener listener) {
+        mVisibilityListener = listener;
+    }
+
+    /**
+     * Shows a progress indicator. If the progress is '100', the progress
+     * indicator will be hidden.
+     *
+     * @param percent the progress in percent (0-100).
+     */
+    public void setProgress(int percent) {
+        // Clamp the value.
+        percent = Math.min(100, Math.max(percent, 0));
+        mProgressAngleDegrees = (int) ((360f / 100) * percent);
+
+        // We hide the progress once we drew the 100% state once.
+        if (percent < 100) {
+            mVisible = true;
+            mTimeToHide = System.currentTimeMillis() + SHOW_PROGRESS_X_ADDITIONAL_MS;
+        }
+    }
+
+    /**
+     * Draw the current progress (if < 100%) centered at the given location.
+     */
+    public void onDraw(Canvas canvas, int centerX, int centerY) {
+        if (!mVisible) {
+            return;
+        }
+        mArcBounds = new RectF(centerX - mProgressRadius, centerY - mProgressRadius, centerX
+                + mProgressRadius,
+                centerY + mProgressRadius);
+
+        canvas.drawCircle(centerX, centerY, mProgressRadius, mProgressBasePaint);
+        canvas.drawArc(mArcBounds, -90, mProgressAngleDegrees, false, mProgressPaint);
+
+        // After we reached 100%, we paint the progress renderer for another x
+        // milliseconds until we hide it.
+        if (mProgressAngleDegrees == 360 && System.currentTimeMillis() > mTimeToHide) {
+            mVisible = false;
+            if (mVisibilityListener != null) {
+                mVisibilityListener.onHidden();
+            }
+        }
+    }
+
+    /**
+     * @return Whether the progress renderer is visible.
+     */
+    public boolean isVisible() {
+        return mVisible;
+    }
+
+    private static Paint createProgressPaint(int width, float alpha) {
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        // 20% alpha.
+        paint.setColor(Color.argb((int) (alpha * 255), 255, 255, 255));
+        paint.setStrokeWidth(width);
+        paint.setStyle(Paint.Style.STROKE);
+        return paint;
+    }
+}
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index dbd078d14..68211d648 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -679,6 +679,16 @@ public class CameraUtil {
         rect.bottom = Math.round(rectF.bottom);
     }
 
+    public static Rect rectFToRect(RectF rectF) {
+        Rect rect = new Rect();
+        rectFToRect(rectF, rect);
+        return rect;
+    }
+
+    public static RectF rectToRectF(Rect r) {
+        return new RectF(r.left, r.top, r.right, r.bottom);
+    }
+
     public static void prepareMatrix(Matrix matrix, boolean mirror, int displayOrientation,
             int viewWidth, int viewHeight) {
         // Need mirror for front camera.
@@ -691,6 +701,21 @@ public class CameraUtil {
         matrix.postTranslate(viewWidth / 2f, viewHeight / 2f);
     }
 
+    public static void prepareMatrix(Matrix matrix, boolean mirror, int displayOrientation,
+                                     Rect previewRect) {
+        // Need mirror for front camera.
+        matrix.setScale(mirror ? -1 : 1, 1);
+        // This is the value for android.hardware.Camera.setDisplayOrientation.
+        matrix.postRotate(displayOrientation);
+
+        // Camera driver coordinates range from (-1000, -1000) to (1000, 1000).
+        // We need to map camera driver coordinates to preview rect coordinates
+        Matrix mapping = new Matrix();
+        mapping.setRectToRect(new RectF(-1000, -1000, 1000, 1000), rectToRectF(previewRect),
+                Matrix.ScaleToFit.FILL);
+        matrix.setConcat(mapping, matrix);
+    }
+
     public static String createJpegName(long dateTaken) {
         synchronized (sImageFileNamer) {
             return sImageFileNamer.generateName(dateTaken);
@@ -820,7 +845,10 @@ public class CameraUtil {
      *         the right range.
      */
     public static int[] getPhotoPreviewFpsRange(Parameters params) {
-        List<int[]> frameRates = params.getSupportedPreviewFpsRange();
+        return getPhotoPreviewFpsRange(params.getSupportedPreviewFpsRange());
+    }
+
+    public static int[] getPhotoPreviewFpsRange(List<int[]> frameRates) {
         if (frameRates.size() == 0) {
             Log.e(TAG, "No suppoted frame rates returned!");
             return null;
@@ -902,6 +930,8 @@ public class CameraUtil {
     public static void playVideo(Activity activity, Uri uri, String title) {
         try {
             boolean isSecureCamera = ((CameraActivity)activity).isSecureCamera();
+            UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                    UsageStatistics.ACTION_PLAY_VIDEO, null);
             if (!isSecureCamera) {
                 Intent intent = IntentHelper.getVideoPlayerIntent(activity, uri)
                         .putExtra(Intent.EXTRA_TITLE, title)
@@ -966,20 +996,4 @@ public class CameraUtil {
         }
         return ret;
     }
-
-    /**
-     * Launches apps supporting action {@link Intent.ACTION_MAIN} of category
-     * {@link Intent.CATEGORY_APP_GALLERY}. Note that
-     * {@link Intent.CATEGORY_APP_GALLERY} is only available on API level 15+.
-     *
-     * @param ctx The {@link android.content.Context} to launch the app.
-     * @return {@code true} on success.
-     */
-    public static boolean launchGallery(Context ctx) {
-        if (ApiHelper.HAS_APP_GALLERY) {
-            ctx.startActivity(IntentHelper.getGalleryIntent(ctx));
-            return true;
-        }
-        return false;
-    }
 }
diff --git a/src_pd/com/android/camera/util/IntentHelper.java b/src_pd/com/android/camera/util/IntentHelper.java
index a6c2c3720..6f17a624b 100644
--- a/src_pd/com/android/camera/util/IntentHelper.java
+++ b/src_pd/com/android/camera/util/IntentHelper.java
@@ -32,7 +32,6 @@ public class IntentHelper {
 
     public static Intent getVideoPlayerIntent(Context context, Uri uri) {
         return new Intent(Intent.ACTION_VIEW)
-            .setPackage(GALLERY_PACKAGE_NAME)
             .setDataAndType(uri, "video/*");
     }
 }
diff --git a/src_pd/com/android/camera/util/UsageStatistics.java b/src_pd/com/android/camera/util/UsageStatistics.java
index 40f74a4ee..98dc89c9f 100644
--- a/src_pd/com/android/camera/util/UsageStatistics.java
+++ b/src_pd/com/android/camera/util/UsageStatistics.java
@@ -8,6 +8,9 @@ public class UsageStatistics {
     public static final String COMPONENT_CAMERA = "Camera";
     public static final String COMPONENT_EDITOR = "Editor";
     public static final String COMPONENT_IMPORTER = "Importer";
+    public static final String COMPONENT_LIGHTCYCLE = "Lightcycle";
+    public static final String COMPONENT_PANORAMA = "Panorama";
+    public static final String COMPONENT_GCAM = "GCam";
 
     public static final String TRANSITION_BACK_BUTTON = "BackButton";
     public static final String TRANSITION_UP_BUTTON = "UpButton";
@@ -22,16 +25,38 @@ public class UsageStatistics {
     public static final String ACTION_CAPTURE_START = "CaptureStart";
     public static final String ACTION_CAPTURE_FAIL = "CaptureFail";
     public static final String ACTION_CAPTURE_DONE = "CaptureDone";
-    public static final String ACTION_SHARE = "Share";
+
+    public static final String ACTION_STITCHING_START = "StitchingStart";
+    public static final String ACTION_STITCHING_DONE = "StitchingDone";
+
+    public static final String ACTION_FOREGROUNDED = "Foregrounded";
+    public static final String ACTION_OPEN_FAIL = "OpenFailure";
+    public static final String ACTION_SCREEN_CHANGED = "ScreenChanged";
+    public static final String ACTION_FILMSTRIP = "Filmstrip";
+    public static final String ACTION_TOUCH_FOCUS= "TouchFocus";
+    public static final String ACTION_DELETE = "Delete";
+    public static final String ACTION_GALLERY = "Gallery";
+    public static final String ACTION_EDIT= "Edit";
+    public static final String ACTION_CROP= "Crop";
+    public static final String ACTION_PLAY_VIDEO= "PlayVideo";
 
     public static final String CATEGORY_LIFECYCLE = "AppLifecycle";
     public static final String CATEGORY_BUTTON_PRESS = "ButtonPress";
 
     public static final String LIFECYCLE_START = "Start";
 
+    public static final String ACTION_SHARE = "Share";
+
     public static void initialize(Context context) {}
     public static void setPendingTransitionCause(String cause) {}
     public static void onContentViewChanged(String screenComponent, String screenName) {}
     public static void onEvent(String category, String action, String label) {};
-    public static void onEvent(String category, String action, String label, long optional_value) {};
+    public static void onEvent(String category, String action, String label, long optionalValue) {};
+    public static void onEvent(String category, String action, String label, long optionalValue,
+                               String fileNameHash) {};
+    public static void onEvent(String category, String action, String label,
+                               long optionalValue, String fileNameHash, String parameters) {}
+    public static String hashFileName(String fileName) {
+        return "";
+    }
 }
diff --git a/version.mk b/version.mk
index 2b6077a40..869c764ad 100644
--- a/version.mk
+++ b/version.mk
@@ -29,12 +29,16 @@
 # NOTE: arch needs to be more significant than density because x86 devices support running ARM
 # code in emulation mode, so all x86 versions must be higher than all ARM versions to ensure
 # we deliver true x86 code to those devices.
+#
+# HISTORY:
+# 2.0.001 - Factory ROM and 0-day OTA 4.4 (KK)
+# 2.0.002 - 4.4 MR1 system image
 
 # Specify the following manually.  Note that base_version_minor must be exactly 1 digit and
 # base_version_build must be exactly 3 digits.
 base_version_major := 2
 base_version_minor := 0
-base_version_build := 001
+base_version_build := 002
 
 #####################################################
 #####################################################
author	Santhosh Kumar H E <skhara@codeaurora.org>	2013-12-05 16:36:52 +0530
committer	Santhosh Kumar H E <skhara@codeaurora.org>	2013-12-06 18:58:24 +0530
commit	dbdb7620da136374eea95170261032f910015db0 (patch)
tree	007242cdb44941ecb855751c85da69aa97cc6a43
parent	1c7734057201ffd1b6d165d9e24793ef3d213043 (diff)
parent	df2b0819907c440a660e228414a18184732816d1 (diff)
download	android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.gz android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.tar.bz2 android_packages_apps_Snap-dbdb7620da136374eea95170261032f910015db0.zip