Merge "Use hyphenated path for android-support-v8-renderscript." into jb-mr2-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0962a2c..d7a115a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera-instellings"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera-instellings"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Prentgrootte"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixels"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pixels"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pixels"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7682220..85736ed 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"የካሜራ ቅንብሮች"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"የካምኮርድ ቅንብሮች"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"የምስል መጠን"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13ሚ ፒክሰሎች"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ሜጋፒክሰል"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ሜጋ ፒክሴል"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ሜጋ ፒክሴል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e0f0ad4..94118ac 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"إعدادات الكاميرا"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"إعدادات كاميرا الفيديو"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"حجم الصورة"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 ميغابكسل"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ميغا بكسل"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ميغا بكسل"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ميغا بكسل"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index b304450..c255ce6 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Налады камеры"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Налады відэакамеры"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Памер малюнка"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 млн. пікселяў"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапікселяў"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 мегапiкселяў"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 мегапiкселя"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0d29023..1eff887 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки на камера"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки на видеокамера"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер на снимка"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапиксела"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 мегапиксела"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 мегапиксела"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7b23c80..0e2e0ed 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuració de la càmera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuració de la càmera de vídeo"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Mida de la imatge"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapíxels"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapíxels"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapíxels"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapíxels"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 444ab94..fca7b64 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavení fotoaparátu"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavení videokamery"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost fotografií"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelů"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpx"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpx"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 906e2d2..49ca422 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -251,6 +251,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Indstillinger for kamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Indstillinger for videokamera"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Billedstørrelse"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixel"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixel"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b92b687..2e1a1f2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameraeinstellungen"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcordereinstellungen"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildgröße"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a4afe6b..4a2194d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ρυθμίσεις βιντεοκάμερας"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Μέγεθος εικόνας"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M εικονοστ."</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M εικονοστ."</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M εικονοστ."</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M εικονοστ."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2a871e5..fa33b75 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera settings"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder settings"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Picture size"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 83bb807..42bec68 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 98f0c31..1771406 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Ajustes de la cámara"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño imagen"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 MP"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f6b030c..d25f8fb 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kaamera seaded"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokaamera seaded"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Pildi suurus"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikslit"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pikslit"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pikslit"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6c04909..5696d75 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"تنظیمات دوربین"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"تنظیمات دوربین فیلمبرداری"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"اندازه تصویر"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"۸ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"۵ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"۳ مگاپیکسل"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 73fa321..b230d04 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameran asetukset"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokameran asetukset"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Kuvan koko"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseliä"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapikseliä"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapikseliä"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 31f7e1f..3c23e1b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres appareil photo"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mode Caméra"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Taille d\'image"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 mégapixels"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M pixels"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M pixels"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7688566..68cfad5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"कैमरा सेटिंग"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"कैमकॉर्डर सेटिंग"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"चित्र आकार"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M पिक्सेल"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M पिक्सेल"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M पिक्सेल"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M पिक्सेल"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c3a1b5b..89a1998 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Postavke fotoaparata"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Postavke kamere"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veličina slike"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapiksela"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapiksela"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapiksela"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3e2f6af..48a6be6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera beállításai"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamera beállításai"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Képméret"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapixel"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixel"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixel"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d90708b..6911eff 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Setelan kamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Setelan perekam video"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Ukuran gambar"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M piksel"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M piksel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M piksel"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 87bc1cd..a34c1fc 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Impostazioni fotocamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Impostazioni videocamera"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensioni foto"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M pixel"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1d1a9af..448bc51 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"הגדרות מצלמה"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"הגדרות מצלמת וידאו"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"גודל תמונה"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 מגה פיקסל"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 מגה פיקסל"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 מגה פיקסלים"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 מגה פיקסלים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2e896b5..7462fea 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"画像サイズ"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8Mピクセル"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5メガピクセル"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3メガピクセル"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 874fd23..0d33200 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"카메라 설정"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"캠코더 설정"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"사진 크기"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M 픽셀"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M 픽셀"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M 픽셀"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8458355..2c3c729 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Fotoaparato nustatymai"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nešiojamosios vaizdo kameros ir magnetofono nustatymai"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Paveikslėlio dydis"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapiks."</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 mln. piks."</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 mln. piks."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 78134d3..e256d0d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kameras iestatījumi"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokameras iestatījumi"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Attēla izmērs"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapikseļi"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseļi"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapikseļi"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapikseļi"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3f5d185..c8940f3 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Tetapan kamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Tetapan kamkorder"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Saiz gambar"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"Piksel 8M"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 82508ef..86fcd34 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -251,6 +251,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainnstillinger"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videoinnstillinger"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildestørrelse"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 M piksler"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapiksler"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapiksler"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapiksler"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e3090df..4dfa1c0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Camera-instellingen"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Camcorder-instellingen"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grootte van foto"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixels"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixel"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3449bb9..431e000 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Ustawienia aparatu"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ustawienia kamery"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Rozmiar zdjęcia"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapikseli"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Mpix"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Mpix"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7b53596..41a6059 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Definições da câmara"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Definições da câmara de vídeo"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 MP"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapíxeis"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapíxeis"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1b303c3..3338639 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Configurações da câmera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configurações da filmadora"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamanho da imagem"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 MP"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 MP"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixels"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixels"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 06334a4..9a56e6d 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -405,6 +405,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Parameters da la camera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Parameters da la camera da video"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Grondezza dal maletg"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<!-- no translation found for pref_camera_picturesize_entry_8mp (259953780932849079) -->
<skip />
<!-- no translation found for pref_camera_picturesize_entry_5mp (2882928212030661159) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a690ffd..7a3acb8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Setările camerei foto"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Setările camerei video"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Dimensiune fotografie"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixeli"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 MP"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 MP"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9d5f8cb..d910451 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки камеры"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки видеокамеры"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фото"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 Мпикс."</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Мпикс."</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Мпикс."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 670c046..fe2de7a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavenia fotoaparátu"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavenie videokamery"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Veľkosť fotografie"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixelov"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixlov"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixle"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 04ecad6..3b29927 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Nastavitve fotoaparata"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Nastavitve kamere"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Velikost slike"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 milijonov slikovnih pik"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 M sl. pik"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 M sl. pik"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e5ffeef..7878b54 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Подешавања камере"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Подешавања камкордера"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Величина слике"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапиксела"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 мегапиксела"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 мегапиксела"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a78489a..47c3689 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamerainställningar"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Videokamerainställningar"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Bildstorlek"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 megapixlar"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 megapixel"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 megapixlar"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapixlar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7b13b30..db283a7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -256,6 +256,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Mipangilio ya kamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mipangilio ya kamkoda"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Ukubwa wa picha"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"Pikseli 13M"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"Pikseli 8M"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"Pikseli 5M"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"Pikseli 3M"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d3cabce..daa941a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"การตั้งค่ากล้องถ่ายรูป"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"การตั้งค่ากล้องวิดีโอ"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"ขนาดของภาพ"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 ล้านพิกเซล"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 ล้านพิกเซล"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 ล้านพิกเซล"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0b655ce..adec462 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Mga setting ng kamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Mga setting ng camcorder"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Laki ng larawan"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixels"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pixels"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pixels"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 086ac17..38de545 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Kamera ayarları"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Kamera ayarları"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Resim boyutu"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 M piksel"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M piksel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M piksel"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3b8232b..a6e4e69 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -253,6 +253,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Налаштування камери"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Налашт-ня відеокамери"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Розмір фото"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13 Мпікс."</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8 мегапікселів"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5 Мпікс"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 Мпікс"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2a1141d..8e20453 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Cài đặt máy ảnh"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Cài đặt máy quay video"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Kích thước ảnh"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M pixel"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M pixel"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M pixel"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 295954a..78a576b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片大小"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"800 万像素"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 万像素"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"300 万像素"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index cfed148..29a163c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -253,6 +253,8 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"相機設定"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"攝錄影機設定"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"相片大小"</string>
+ <!-- no translation found for pref_camera_picturesize_entry_13mp (675309554194481780) -->
+ <skip />
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"800 萬像素"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"500 萬像素"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"300 萬像素"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 49d8faa..0875a62 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -255,6 +255,7 @@
<string name="pref_camera_settings_category" msgid="2576236450859613120">"Izilungiselelo zekhamera"</string>
<string name="pref_camcorder_settings_category" msgid="460313486231965141">"Izilungiselelo zekhamera enerekhoda"</string>
<string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Usayizi wesithombe"</string>
+ <string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"13M amaphikiseli"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"8M amaphikseli"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"5M amaphikseli"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3M amaphikseli"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f40c6ef..5457650 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -159,8 +159,10 @@
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
+ <item>@string/pref_camera_picturesize_entry_4mp</item>
<item>@string/pref_camera_picturesize_entry_3mp</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_3mp</item>
<item>@string/pref_camera_picturesize_entry_1mp</item>
<item>@string/pref_camera_picturesize_entry_vga</item>
@@ -176,8 +178,10 @@
<item>2592x1944</item>
<item>2592x1936</item>
<item>2560x1920</item>
+ <item>2688x1520</item>
<item>2048x1536</item>
<item>1600x1200</item>
+ <item>1920x1088</item>
<item>1280x960</item>
<item>1024x768</item>
<item>640x480</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ec4da6..cb4bc18 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -678,10 +678,14 @@
<string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
<!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_5mp">5M pixels</string>
+ <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
<!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_3mp">3M pixels</string>
<!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_2mp">2M pixels</string>
+ <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
+ <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>
<!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] -->
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 5b35271..e88645d 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1628,6 +1628,8 @@
return; // Exiting, so no need to get the surface texture.
}
mUI.setSurfaceTexture(screenNail.getSurfaceTexture());
+ } else {
+ updatePreviewSize(screenNail);
}
mCameraDevice.setDisplayOrientation(mCameraDisplayOrientation);
Object st = mUI.getSurfaceTexture();
@@ -1649,6 +1651,21 @@
}
}
+ private void updatePreviewSize(CameraScreenNail snail) {
+ Size size = mParameters.getPreviewSize();
+ int w = size.width;
+ int h = size.height;
+ if (mCameraDisplayOrientation % 180 != 0) {
+ w = size.height;
+ h = size.width;
+ }
+ if (snail.getWidth() != w || snail.getHeight() != h) {
+ snail.setSize(w, h);
+ }
+ snail.enableAspectRatioClamping();
+ mActivity.notifyScreenNailChanged();
+ }
+
@Override
public void stopPreview() {
if (mCameraDevice != null && mCameraState != PREVIEW_STOPPED) {
@@ -1742,10 +1759,14 @@
Size original = mParameters.getPreviewSize();
if (!original.equals(optimalSize)) {
mParameters.setPreviewSize(optimalSize.width, optimalSize.height);
-
// Zoom related settings will be changed for different preview
// sizes, so set and read the parameters to get latest values
- mCameraDevice.setParameters(mParameters);
+ if (mHandler.getLooper() == Looper.myLooper()) {
+ // On UI thread only, not when camera starts up
+ setupPreview();
+ } else {
+ mCameraDevice.setParameters(mParameters);
+ }
mParameters = mCameraDevice.getParameters();
}
Log.v(TAG, "Preview size is " + optimalSize.width + "x" + optimalSize.height);
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index dc23ec8..9fc0576 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -345,6 +345,7 @@
// PieListener
@Override
public void onPieOpened(int centerX, int centerY) {
+ dismissPopup(false, true);
mActivity.cancelActivityTouchHandling();
mActivity.setSwipingEnabled(false);
}
