From 84b2ffbcf4360332691379a7249a811d3e7c5bb0 Mon Sep 17 00:00:00 2001 From: Wilhelm Fitzpatrick Date: Fri, 14 Nov 2014 16:31:35 -0800 Subject: CameraNext: dynamically generate available photo resolutions Instead of depending on a large matching table, generated the list of picture sizes to show to the user directly from the supported list returned by the camera. The list is filtered to remove uselessly small resolutions on modern devices, to group resolutions by aspect ratio, and to filter out fairly similar sizes. Change-Id: I47a67a89786543baec133cf7e71df9819793ebac Signed-off-by: Chippa-a --- res/values-af/strings.xml | 12 --- res/values-am/strings.xml | 12 --- res/values-ar/strings.xml | 12 --- res/values-az-rAZ/strings.xml | 11 --- res/values-bg/strings.xml | 12 --- res/values-ca/strings.xml | 12 --- res/values-cs/strings.xml | 12 --- res/values-da/strings.xml | 12 --- res/values-de/strings.xml | 12 --- res/values-el/strings.xml | 12 --- res/values-en-rGB/strings.xml | 12 --- res/values-en-rIN/strings.xml | 12 --- res/values-es-rUS/strings.xml | 12 --- res/values-es/strings.xml | 12 --- res/values-et-rEE/strings.xml | 12 --- res/values-et/strings.xml | 8 -- res/values-fa/strings.xml | 12 --- res/values-fi/strings.xml | 12 --- res/values-fr-rCA/strings.xml | 12 --- res/values-fr/strings.xml | 12 --- res/values-hi/strings.xml | 12 --- res/values-hr/strings.xml | 12 --- res/values-hu/strings.xml | 12 --- res/values-hy-rAM/strings.xml | 12 --- res/values-in/strings.xml | 12 --- res/values-it/strings.xml | 12 --- res/values-iw/strings.xml | 12 --- res/values-ja/strings.xml | 12 --- res/values-ka-rGE/strings.xml | 12 --- res/values-km-rKH/strings.xml | 12 --- res/values-ko/strings.xml | 12 --- res/values-lo-rLA/strings.xml | 12 --- res/values-lt/strings.xml | 12 --- res/values-lv/strings.xml | 12 --- res/values-mn-rMN/strings.xml | 12 --- res/values-ms-rMY/strings.xml | 12 --- res/values-ms/strings.xml | 8 -- res/values-nb/strings.xml | 12 --- res/values-ne-rNP/strings.xml | 11 --- res/values-nl/strings.xml | 12 --- res/values-pl/strings.xml | 12 --- res/values-pt-rPT/strings.xml | 12 --- res/values-pt/strings.xml | 12 --- res/values-ro/strings.xml | 12 --- res/values-ru/strings.xml | 12 --- res/values-si-rLK/strings.xml | 11 --- res/values-sk/strings.xml | 12 --- res/values-sl/strings.xml | 12 --- res/values-sr/strings.xml | 12 --- res/values-sv/strings.xml | 12 --- res/values-sw/strings.xml | 12 --- res/values-th/strings.xml | 12 --- res/values-tl/strings.xml | 12 --- res/values-tr/strings.xml | 12 --- res/values-uk/strings.xml | 12 --- res/values-vi/strings.xml | 12 --- res/values-zh-rCN/strings.xml | 18 ----- res/values-zh-rHK/strings.xml | 12 --- res/values-zh-rTW/strings.xml | 12 --- res/values-zu/strings.xml | 12 --- res/values/arrays.xml | 142 +---------------------------------- res/values/camera2arrays.xml | 79 ------------------- res/values/cm_strings.xml | 16 ++++ res/values/config.xml | 2 + res/values/qcomstrings.xml | 11 --- res/values/strings.xml | 41 ---------- res/xml/camera_preferences.xml | 4 +- res/xml/capture_preferences.xml | 2 - res/xml/setting_menu_preferences.xml | 2 - res/xml/video_preferences.xml | 4 +- 70 files changed, 21 insertions(+), 997 deletions(-) (limited to 'res') diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 67103add3..65e401f6e 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -114,18 +114,6 @@ "Kamera-instellings" "Videokamera-instellings" "Prentgrootte" - "13 M pieksels" - "8 M pieksels" - "5 M pieksels" - "4 M pieksels (16:9)" - "3 M pieksels" - "2 M pieksels" - "2 M pieksels (16:9)" - "1,5 M pieksels" - "1,3 M pieksels" - "1 M pieksels" - "VGA" - "QVGA" "Fokusmodus" "Outo" "Oneindig" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 804fc9b6e..fc76fe50b 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -114,18 +114,6 @@ "የካሜራ ቅንብሮች" "የካምኮርደር ቅንብሮች" "የምስል መጠን" - "13ሚ ፒክሰሎች" - "8ሚ ፒክሰሎች" - "5ሚ ፒክሰሎች" - "4ሚ ፒክሰል (16:9)" - "3ሚ ፒክሰሎች" - "2ሚ ፒክሰሎች" - "2ሚ ፒክሰሎች (16:9)" - "1.5 ሚ ፒክሰሎች" - "1.3ሚ ፒክሰሎች" - "1ሚ ፒክሰሎች" - "VGA" - "QVGA" "የትኩረት ሁነታ" "ራስ-ሰር" "የትየሌለ" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 9c2a55702..d86b1bb62 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -114,18 +114,6 @@ "إعدادات الكاميرا" "إعدادات كاميرا الفيديو" "حجم الصورة" - "13 ميغا بكسل" - "8 ميغا بكسل" - "5 ميغا بكسل" - "4 ميغا بكسل (16:9)" - "3 ميغا بكسل" - "2 ميغا بكسل" - "2 ميغا بكسل (16‏:9)" - "1.5 ميغا بكسل" - "1.3 ميغا بكسل" - "1 ميغا بكسل" - "VGA" - "QVGA" "وضع البؤرة" "تلقائيًا" "بلا نهاية" diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index 54b53514a..f4f8f4f9b 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -112,17 +112,6 @@ "Kamera parametrləri" "Videokamera ayarları" "Şəklin ölçüsü" - "13N piksel" - "8M piksel" - "5M Piksel" - "4M piksel (16:9)" - "3M piksel" - "2M piksel" - "2M piksel (16:9)" - "1.3M piksel" - "1M piksel" - "VGA" - "QVGA" "Fokus rejimi" "Avto" "Sonsuzluq" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 31f5eff7f..1f27a7382 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -114,18 +114,6 @@ "Настройки на камерата" "Настройки на видеокамерата" "Размер на снимката" - "13 мегапиксела" - "8 мегапиксела" - "5 мегапиксела" - "4 мегапиксела (16:9)" - "3 мегапиксела" - "2 мегапиксела" - "2 мегапиксела (16:9)" - "1,5 мегапиксела" - "1,3 мегапиксела" - "1 мегапиксел" - "VGA" - "QVGA" "Фокусен режим" "Автоматично" "Безкрайност" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 656083ce0..ae33713ae 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -114,18 +114,6 @@ "Configuració de la càmera" "Configuració de la càmera de vídeo" "Mida de la foto" - "13 Mp" - "8 Mp" - "5 Mp" - "4 Mp (16:9)" - "3 Mp" - "2 Mp" - "2 Mp (16:9)" - "1,5 Mp" - "1,3 Mp" - "1 Mp" - "VGA" - "QVGA" "Mode d\'enfocament" "Auto" "Infinit" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index ed699c38e..e15430a2c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -114,18 +114,6 @@ "Nastavení fotoaparátu" "Nastavení videokamery" "Velikost fotografie" - "13 Mpx" - "8 Mpx" - "5 Mpx" - "4 Mpx (16:9)" - "3 Mpx" - "2 Mpx" - "2 Mpx (16:9)" - "1,5 Mpx" - "1,3 Mpx" - "1 Mpx" - "VGA" - "QVGA" "Režim zaostření" "Automaticky" "Nekonečno" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index f7771221f..f40c75078 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -114,18 +114,6 @@ "Kameraindstillinger" "Indstillinger for Videokamera" "Billedstørrelse" - "13 megapixels" - "8 megapixels" - "5 megapixels" - "4 M pixels (16:9)" - "3 megapixel" - "2 megapixels" - "2 megapixels (16:9)" - "1,5 megapixels" - "1,3 megapixels" - "1 megapixel" - "VGA" - "QVGA" "Fokustilstand" "Automatisk" "Uendeligt" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index abcc8a709..397792a55 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -114,18 +114,6 @@ "Kameraeinstellungen" "Camcorder-Einstellungen" "Bildgröße" - "13 MP" - "8 MP" - "5 MP" - "4 MP (16:9)" - "3 MP" - "2 MP" - "2 MP (16:9)" - "1,5 Megapixel" - "1,3 MP" - "1 MP" - "VGA" - "QVGA" "Fokussierungsmodus" "Automatisch" "Unendlich" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index b4dae8f5a..2aa240c79 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -114,18 +114,6 @@ "Ρυθμίσεις φωτογραφικής μηχανής" "Ρυθμίσεις βιντεοκάμερας" "Μέγεθος εικόνας" - "13M εικονοστοιχεία" - "8M εικονοστοιχεία" - "5M εικονοστοιχεία" - "4 εκ.εικονοστ.(16:9)" - "3M εικονοστοιχεία" - "2M εικονοστοιχεία" - "2M εικονοστ. (16:9)" - "1.5M pixel" - "1.3M εικονοστοιχεία" - "1M εικονοστοιχεία" - "VGA" - "QVGA" "Λειτουργία εστίασης" "Αυτόματα" "Άπειρο" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index ef35e9e9e..c1137396a 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -114,18 +114,6 @@ "Camera settings" "Camcorder settings" "Picture size" - "13 M pixels" - "8 M pixels" - "5 M pixels" - "4 M pixels (16:9)" - "3 M pixels" - "2 M pixels" - "2 M pixels (16:9)" - "1.5 M pixels" - "1.3 M pixels" - "1 M pixels" - "VGA" - "QVGA" "Focus mode" "Auto" "Infinity" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index ef35e9e9e..c1137396a 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -114,18 +114,6 @@ "Camera settings" "Camcorder settings" "Picture size" - "13 M pixels" - "8 M pixels" - "5 M pixels" - "4 M pixels (16:9)" - "3 M pixels" - "2 M pixels" - "2 M pixels (16:9)" - "1.5 M pixels" - "1.3 M pixels" - "1 M pixels" - "VGA" - "QVGA" "Focus mode" "Auto" "Infinity" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 25d65b7ce..26ebcfe4b 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -114,18 +114,6 @@ "Configuración de la cámara" "Configuración de cámara de video" "Tamaño de imagen" - "13 megapíxeles" - "8 megapíxeles" - "5 megapíxeles" - "4 MP (16:9)" - "3 megapíxeles" - "2 megapíxeles" - "2 megapíxeles (16:9)" - "1,5 MP" - "1,3 megapíxeles" - "1 megapíxel" - "VGA" - "QVGA" "Modo Enfoque" "Automático" "Infinito" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index bf8e52f7f..e7954e350 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -114,18 +114,6 @@ "Ajustes de la cámara" "Ajustes de videocámara" "Tamaño de imagen" - "13 MP" - "8 MP" - "5 MP" - "4 MP (16:9)" - "3 MP" - "2 MP" - "2 MP (16:9)" - "1,5 MP" - "1,3 MP" - "1 MP" - "VGA" - "QVGA" "Modo de enfoque" "Automático" "Infinito" diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index f69805a26..a2532dd45 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -114,18 +114,6 @@ "Kaamera seaded" "Videokaamera seaded" "Pildi suurus" - "13 megapikslit" - "8 megapikslit" - "5 megapikslit" - "4M pikslit (16 : 9)" - "3 megapikslit" - "2 megapikslit" - "2 MP (16 : 9)" - "1,5 megapikslit" - "1,3 megapikslit" - "1 megapiksel" - "VGA" - "QVGA" "Teravustamisrežiim" "Automaatne" "Lõpmatus" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 8b41d958d..3ec9f5e96 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -124,14 +124,6 @@ "Kaamera seaded" "Videokaamera seaded" "Pildi suurus" - "8 megapikslit" - "5M pikslit" - "3M pikslit" - "2M pikslit" - "1,3M pikslit" - "1M pikslit" - "VGA" - "QVGA" "Teravustamisrežiim" "Automaatne" "Lõpmatus" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 0f9dda3c3..495f2c604 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -114,18 +114,6 @@ "تنظیمات دوربین" "تنظیمات دوربین فیلم‌برداری" "اندازه تصویر" - "۱۳ مگاپیکسل" - "۸ مگاپیکسل" - "۵ مگاپیکسل" - "‫۴ مگاپیکسل (۱۶:۹)‏" - "۳ مگاپیکسل" - "۲ مگاپیکسل" - "‫۲ مگاپیکسل (۱۶:۹)‏" - "‫۱٫۵ مگاپیکسل" - "۱٫۳ مگاپیکسل" - "۱ مگاپیکسل" - "VGA" - "QVGA" "حالت فوکوس" "خودکار" "بی‌نهایت" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 98577967c..9801d67d3 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -114,18 +114,6 @@ "Kameran asetukset" "Videokameran asetukset" "Kuvan koko" - "13 megapikseliä" - "8 megapikseliä" - "5 megapikseliä" - "4 megapiks. (16:9)" - "3 megapikseliä" - "2 megapikseliä" - "2 megap. (16:9)" - "1,5 megapikseliä" - "1,3 megapikseliä" - "1 megapikseli" - "VGA" - "QVGA" "Tarkennustila" "Auto" "Loputon" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 11bc8ac08..974ccd3e9 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -114,18 +114,6 @@ "Paramètres de l\'appareil photo" "Paramètres de la caméra" "Taille de l\'image" - "13 mégapixels" - "8 mégapixels" - "5 mégapixels" - "4 mégapixels (16:9)" - "3 mégapixels" - "2 mégapixels" - "2 mégapixels (16:9)" - "1,5 mégapixel" - "1,3 mégapixel" - "1 mégapixel" - "VGA" - "QVGA" "Mode de mise au point" "Automatique" "Infini" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 6dfe14c68..9bd165072 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -114,18 +114,6 @@ "Paramètres de l\'application Appareil photo" "Paramètres de la caméra" "Taille de l\'image" - "13 mégapixels" - "8 mégapixels" - "5 mégapixels" - "4 mégapixels (16:9)" - "3 mégapixels" - "2 mégapixels" - "2 mégapixels (16:9)" - "1,5 mégapixel" - "1,3 mégapixel" - "1 mégapixel" - "VGA" - "QVGA" "Mode de mise au point" "Automatique" "Infini" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 532b62ec8..ed40942ff 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -114,18 +114,6 @@ "कैमरा सेटिंग" "कैमकॉर्डर सेटिंग" "फ़ोटो आकार" - "13M पिक्सेल" - "8M पिक्सेल" - "5M पिक्सेल" - "4M पिक्सेल (16:9)" - "3M पिक्सेल" - "2M पिक्सेल" - "2M पिक्सेल (16:9)" - "1.5M पिक्सेल" - "1.3M पिक्सेल" - "1M पिक्सेल" - "VGA" - "QVGA" "फ़ोकस मोड" "स्वतः" "अनंत" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index f3a5315fb..80971d9ae 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -114,18 +114,6 @@ "Postavke fotoaparata" "Postavke kamere" "Veličina slike" - "13 megapiksela" - "8 megapiksela" - "5 megapiksela" - "4 megapiksela (16:9)" - "3 megapiksela" - "2 megapiksela" - "2 mpiks. (16:9)" - "1,5 megapiksela" - "1,3 megapiksela" - "1 megapiksel" - "VGA" - "QVGA" "Način fokusa" "Automatski" "Beskonačno" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 50b435db4..762d651b0 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -114,18 +114,6 @@ "Kamerabeállítások" "Videokamera beállításai" "Képméret" - "13 megapixel" - "8 megapixel" - "5 megapixel" - "4 megapixel (16:9)" - "3 megapixel" - "2 megapixel" - "2 megapixel (16:9)" - "1,5 megapixel" - "1,3 megapixel" - "1 megapixel" - "VGA" - "QVGA" "Fókuszálás módja" "Automatikus" "Végtelen" diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 7f93a9c8e..4dec9266a 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -114,18 +114,6 @@ "Տեսախցիկի կարգավորումներ" "Տեսախցիկի կարգավորումներ" "Նկարի չափը" - "13Մ պիքսել" - "8Մ պիքսել" - "5Մ պիքսել" - "4Մ պիքսել (16:9)" - "3Մ պիքսել" - "2Մ պիքսել" - "2Մ պիքսել (16:9)" - "1.5Մ պիքսել" - "1.3Մ պիքսել" - "1Մ պիքսել" - "VGA" - "QVGA" "Կենտրոնացման ռեժիմ" "Ավտոմատ" "Անսահման" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index a72bec4ae..50dea5e9e 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -114,18 +114,6 @@ "Setelan kamera" "Setelan perekam video" "Ukuran gambar" - "13 M piksel" - "8 M piksel" - "5 M piksel" - "4M piksel (16:9)" - "3 M piksel" - "2 M piksel" - "2 M px (16:9)" - "1,5M piksel" - "1,3 M piksel" - "1 M piksel" - "VGA" - "QVGA" "Mode fokus" "Otomatis" "Tak Terbatas" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 9c42c1c49..0bc6c97f8 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -114,18 +114,6 @@ "Impostazioni della fotocamera" "Impostazioni videocamera" "Dimensioni immagine" - "13 Mpixel" - "8 Mpixel" - "5 Mpixel" - "4 Mpixel (16:9)" - "3 Mpixel" - "2 Mpixel" - "2 Mpixel (16:9)" - "1,5 megapixel" - "1,3 Mpixel" - "1 Mpixel" - "VGA" - "QVGA" "Modalità messa a fuoco" "Automatica" "Infinito" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index e262df3c8..d70eda788 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -114,18 +114,6 @@ "הגדרות המצלמה" "הגדרות של מצלמת וידאו" "גודל תמונה" - "13 מגה פיקסל" - "8 מגה פיקסל" - "5 מגה פיקסל" - "4 מגה פיקסל (16:9)" - "3 מגה פיקסל" - "2 מגה פיקסל" - "2 מגה פיקסל (16:9)" - "1.5 מגה פיקסל" - "1.3 מגה פיקסל" - "מגה פיקסל אחד" - "VGA" - "QVGA" "מצב מיקוד" "אוטומטי" "אינסוף" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 963b69345..550978268 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -114,18 +114,6 @@ "カメラの設定" "ビデオ録画の設定" "画像サイズ" - "13メガピクセル" - "8メガピクセル" - "5メガピクセル" - "4Mピクセル（16:9）" - "3メガピクセル" - "2メガピクセル" - "2Mピクセル（16:9）" - "1.5Mピクセル" - "1.3メガピクセル" - "1メガピクセル" - "VGA" - "QVGA" "フォーカスモード" "オート" "無限遠" diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 138a71550..208f512b0 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -114,18 +114,6 @@ "კამერის პარამეტრები" "ვიდეოჩამწერის პარამეტრები" "სურათის ზომა" - "13 მეგაპიქსელი" - "8 მეგაპიქსელი" - "5 მეგაპიქსელი" - "4 მეგაპიქსელი (16:9)" - "3 მეგაპიქსელი" - "2 მეგაპიქსელი" - "2 მეგაპიქსელი (16:9)" - "1,5 მეგაპიქსელი" - "1.3 მეგაპიქსელი" - "1 მეგაპიქსელი" - "VGA" - "QVGA" "ფოკუს რეჟიმი" "ავტომატური" "უსასრულობა" diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 55c1ad836..c871c020e 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -114,18 +114,6 @@ "ការ​កំណត់​ម៉ាស៊ីន​ថត" "ការ​កំណត់​ម៉ាស៊ីន​ថត​វីដេអូ" "ទំហំ​រូបភាព" - "១៣ មេហ្គាភីកសែល" - "៨ មេហ្គា​ភីកសែល" - "៥ មេហ្គា​ភីកសែល" - "៤ មេហ្គា​ភីកសែល (16:9)" - "៣ មេហ្គា​ភីកសែល" - "២ មេហ្គា​ភីកសែល" - "២ មេហ្គាភីក​សែល (16:9)" - "១.៥ មេហ្គាភីក​សែល" - "១.៣ មេហ្គា​ភីកសែល" - "១ មេហ្គា​ភីកសែល" - "VGA" - "QVGA" "របៀប​ផ្ដោត" "ស្វ័យប្រវត្តិ" "និរន្ត" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 728934487..1491019c7 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -114,18 +114,6 @@ "카메라 설정" "캠코더 설정" "사진 크기" - "1300만 화소" - "800만 화소" - "500만 화소" - "4백만 화소(16:9)" - "300만 화소" - "200만 화소" - "200만 화소(16:9)" - "150만 화소" - "130만 화소" - "100만 화소" - "VGA" - "QVGA" "초점 모드" "자동" "무한대" diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 056402adf..32f2e0e63 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -114,18 +114,6 @@ "ການຕັ້ງຄ່າກ້ອງ" "ຕັ້ງຄ່າກ້ອງວິດີໂອ" "ຂະໜາດຮູບ" - "13 ລ້ານພິກເຊວ" - "8 ລ້ານພິກເຊວ" - "5 ລ້ານພິກເຊວ" - "4 ລ້ານພິກເຊວ (16:9)" - "3 ລ້ານພິກເຊວ" - "2 ລ້ານພິກເຊວ" - "2 ລ້ານພິກເຊວ (16:9​)" - "1.5 ລ້ານພິກເຊວ" - "1.3 ລ້ານພິກເຊວ" - "1 ລ້ານພິກເຊວ" - "VGA" - "QVGA" "ໂໝດໂຟກັສ" "ອັດຕະໂນມັດ" "ອິນຟິນິຕີ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index e7ddb52cb..e1807afb9 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -114,18 +114,6 @@ "Fotoaparato nustatymai" "Vaizdo kameros nustatymai" "Nuotraukos dydis" - "13 megapikselių" - "8 megapikseliai" - "5 megapikseliai" - "4 megapiks. (16:9)" - "3 megapikseliai" - "2 megapikseliai" - "2 megapiks. (16:9)" - "1,5 megapiks." - "1,3 megapikselio" - "1 megapikselis" - "VGA" - "QVGA" "Fokusavimo režimas" "Automatinis" "Begalybė" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index fab48546d..b051b4ac0 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -114,18 +114,6 @@ "Kameras iestatījumi" "Videokameras iestatījumi" "Attēla lielums" - "13 megapikseļi" - "8 megapikseļi" - "5 megapikseļi" - "4 megapikseļi (16:9)" - "3 megapikseļi" - "2 megapikseļi" - "2 megapiks. (16:9)" - "1,5 megapikseļi" - "1,3 megapikseļi" - "1 megapikselis" - "VGA" - "QVGA" "Fokusa režīms" "Automātiski" "Bezgalība" diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 8a33e905f..a8d2f90b7 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -114,18 +114,6 @@ "Камерын тохиргоо" "Камерын тохиргоо" "Зургийн хэмжээ" - "13M пиксел" - "8M пиксел" - "5M пиксел" - "4M пиксел (16:9)" - "3M пиксел" - "2M пиксел" - "2M пиксел (16:9)" - "1.5M пиксел" - "1.3M пиксел" - "1M пиксел" - "VGA" - "QVGA" "Фокус горим" "Автомат" "Хязгааргүй" diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index d507e3a00..4b7859a18 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -114,18 +114,6 @@ "Tetapan kamera" "Tetapan kamkorder" "Saiz gambar" - "13M piksel" - "8M piksel" - "5M piksel" - "4M piksel (16:9)" - "3M piksel" - "2M piksel" - "2M piksel (16:9)" - "1.5M piksel" - "1.3M piksel" - "1M piksel" - "VGA" - "QVGA" "Mod fokus" "Auto" "Infiniti" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 59a8594a0..305066dfa 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -124,14 +124,6 @@ "Tetapan kamera" "Tetapan kamkorder" "Saiz gambar" - "Piksel 8M" - "5M piksel" - "3M piksel" - "2M piksel" - "1.3M piksel" - "1M piksel" - "VGA" - "QVGA" "Mod fokus" "Auto" "Infiniti" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 2b8b7fb40..2bd8ccae0 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -114,18 +114,6 @@ "Kamerainnstillinger" "Videoinnstillinger" "Bildestørrelse" - "13 megapiksler" - "8 megapiksler" - "5 megapiksler" - "4M piksler (16:9)" - "3 megapiksler" - "2 megapiksler" - "2 megapiksler (16:9)" - "1,5 M piksler" - "1,3 megapiksler" - "1 megapiksel" - "VGA" - "QVGA" "Fokusmodus" "Auto" "Uendelig" diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index f84686124..c1598ff59 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -115,17 +115,6 @@ "क्यामरा सेटिङहरू" "क्यामकोडर सेटिङहरू" "चित्र आकार" - "13M पिक्सेल" - "8M पिक्सल" - "5M पिक्सेल" - "4M पिक्सेल (16:9)" - "3M पिक्सल" - "२ मेगा पिक्सेल" - "2M पिक्सेल (16:9)" - "1.3M पिक्सेल" - "१ मेगा पिक्सेल" - "VGA" - "QVGA" "फोकस मोड" "स्वतः" "अनन्तता" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 5f10988fd..f8c73e472 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -114,18 +114,6 @@ "Camera-instellingen" "Camcorderinstellingen" "Grootte van foto" - "13 megapixel" - "8 megapixel" - "5 megapixel" - "4 megapixel (16:9)" - "3 megapixel" - "2 megapixel" - "2 megapixel (16:9)" - "1,5 megapixel" - "1,3 megapixel" - "1 megapixel" - "VGA" - "QVGA" "Scherpstelmodus" "Automatisch" "Oneindig" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 78b44015b..c9c2a6a93 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -114,18 +114,6 @@ "Ustawienia aparatu" "Ustawienia kamery" "Rozmiar zdjęcia" - "13 Mpix" - "8 Mpix" - "5 Mpix" - "4 megapiksele (16:9)" - "3 Mpix" - "2 Mpix" - "2 Mpix (16:9)" - "1,5 mln pikseli" - "1,3 Mpix" - "1 Mpix" - "VGA" - "QVGA" "Tryb ostrości" "Automatycznie" "Nieskończoność" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 7efbe23da..a28091686 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -114,18 +114,6 @@ "Definições da câmara" "Definições da câmara de vídeo" "Tamanho da imagem" - "13 MP" - "8 MP" - "5 MP" - "4 megapíxeis (16:9)" - "3 MP" - "2 MP" - "2 MP (16:9)" - "1,5 megapíxeis" - "1,3 MP" - "1 MP" - "VGA" - "QVGA" "Modo de focagem" "Automático" "Infinito" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index ab30fc5e9..f65364fd2 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -114,18 +114,6 @@ "Configurações da câmera" "Configurações da câmera de vídeo" "Tamanho da imagem" - "13 MP" - "8 MP" - "5 MP" - "4 MP (16:9)" - "3 MP" - "2 MP" - "2 MP (16:9)" - "1.5 MP" - "1.3 MP" - "1 MP" - "VGA" - "QVGA" "Modo de foco" "Automático" "Infinito" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 84a7d426c..0f1e29703 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -114,18 +114,6 @@ "Setări cameră foto" "Setările camerei video" "Dimensiune fotografie" - "13 MP" - "8 MP" - "5 MP" - "4 MP (16:9)" - "3 MP" - "2 MP" - "2 MP (16:9)" - "1,5 MP" - "1,3 MP" - "1 MP" - "VGA" - "QVGA" "Mod focalizare" "Automat" "Infinit" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index bde08da8e..61dfa68d7 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -114,18 +114,6 @@ "Настройки камеры" "Настройки видеокамеры" "Размер изображения" - "13 Мпикс." - "8 Мпикс." - "5 Мпикс." - "4 Мпикс. (16:9)" - "3 Мпикс." - "2 Мпикс." - "2 Мпикс. (16:9)" - "1,5 Мпикс." - "1,3 Мпикс." - "1 Мпикс." - "640 х 480 пикс." - "320 x 240 пикс." "Режим фокусировки" "Авто" "Бесконечность" diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 31d9e5aa4..53385e7f6 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -112,17 +112,6 @@ "කැමරා සැකසීම්" "කැම්කෝඩර සැකසීම්" "පින්තූර ප්‍රමාණය" - "පික්සල් 13M" - "පික්සල 8M" - "පික්සල 5M" - "4M පික්සල් (16:9)" - "පික්සල 3M" - "පික්සල 2M" - "2M පික්සල් (16:9)" - "පික්සල 1.3M" - "පික්සල 1M" - "VGA" - "QVGA" "නාභිගත ප්‍රකාරය" "ස්වයං" "අනන්තය" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index d42c0ac95..6146a5a8a 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -114,18 +114,6 @@ "Nastavenia fotoaparátu" "Nastavenie videokamery" "Veľkosť fotografie" - "13 Mpx" - "8 Mpx" - "5 Mpx" - "4 megapixely (16:9)" - "3 Mpx" - "2 Mpx" - "2 Mpx (16:9)" - "1,5 Mpx" - "1,3 Mpx" - "1 Mpx" - "VGA" - "QVGA" "Režim zaostrenia" "Automaticky" "Nekonečno" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 2c1daafe9..e784a3587 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -114,18 +114,6 @@ "Nastavitve fotoaparata" "Nastavitve videokamere" "Velikost slike" - "13 M slikovnih pik" - "8 M slikovnih pik" - "5 M slikovnih pik" - "4 mio. pik (16 : 9)" - "3 M slikovnih pik" - "2 M slikovnih pik" - "2 M pik (16 : 9)" - "1,5 mio. sl. pik" - "1,3 M slikovnih pik" - "1 M slikovnih pik" - "VGA" - "QVGA" "Način ostrenja" "Samodejno" "Neskončno" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 4aa8cdaf4..07a6903e9 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -114,18 +114,6 @@ "Подешавања камере" "Подешавања камкордера" "Величина слике" - "13 мегапиксела" - "8 мегапиксела" - "5 мегапиксела" - "4 мегапиксела (16:9)" - "3 мегапиксела" - "2 мегапиксела" - "2 мегапиксела (16:9)" - "1,5 мегапиксела" - "1,3 мегапиксела" - "1 мегапиксел" - "VGA" - "QVGA" "Режим фокуса" "Аутоматски" "Бесконачност" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index a9662e237..d6c791bf9 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -114,18 +114,6 @@ "Kamerainställningar" "Videokamerainställningar" "Bildstorlek" - "13 megapixlar" - "8 megapixlar" - "5 megapixlar" - "4 megapixlar (16:9)" - "3 megapixlar" - "2 megapixlar" - "2 megapixlar (16:9)" - "1,5 megapixel" - "1,3 megapixlar" - "1 megapixel" - "VGA" - "QVGA" "Fokusläge" "Auto" "Oändligt" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index da6e26625..8df8a4768 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -114,18 +114,6 @@ "Mipangilio ya kamera" "Mipangilio ya kamkoda" "Ukubwa wa picha" - "Megapikseli 13" - "Megapikseli 8" - "Megapikseli 5" - "Pikseli milioni 4 (16:09)" - "Megapikseli 3" - "Megapikseli 2" - "Megapikseli 2 (16:9)" - "Pikseli Milioni 1.5" - "Megapikseli 1.3" - "Megapikseli 1" - "VGA" - "QVGA" "Hali ya kulenga" "Kiotomatiki" "Pasipo mwisho" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 12418580a..657161404 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -114,18 +114,6 @@ "การตั้งค่ากล้องถ่ายรูป" "การตั้งค่ากล้องวิดีโอ" "ขนาดของภาพ" - "13 ล้านพิกเซล" - "8 ล้านพิกเซล" - "5 ล้านพิกเซล" - "4M พิกเซล (16:9)" - "3 ล้านพิกเซล" - "2 ล้านพิกเซล" - "2 ล้านพิกเซล (16:9)" - "1.5 ล้านพิกเซล" - "1.3 ล้านพิกเซล" - "1 ล้านพิกเซล" - "VGA" - "QVGA" "โหมดโฟกัส" "ออโต้" "อินฟินิตี" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 5ef715552..bf7aefa56 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -114,18 +114,6 @@ "Mga setting ng camera" "Mga setting ng camcorder" "Laki ng larawan" - "13M pixel" - "8M pixel" - "5M pixel" - "4M pixels (16:9)" - "3M pixel" - "2M pixel" - "2M pixel (16:9)" - "1.5M pixel" - "1.3M pixel" - "1M pixel" - "VGA" - "QVGA" "Focus mode" "Auto" "Infinity" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 34164bb62..a78b4fd5a 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -114,18 +114,6 @@ "Kamera ayarları" "Video kamera ayarları" "Resim boyutu" - "13 megapiksel" - "8 megapiksel" - "5 megapiksel" - "4 M piksel (16:9)" - "3 megapiksel" - "2 megapiksel" - "2 megapiksel (16:9)" - "1,5 M piksel" - "1,3 megapiksel" - "1 megapiksel" - "VGA" - "QVGA" "Odak modu" "Otomatik" "Sonsuz" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 80d71c91f..e6a3c2b64 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -114,18 +114,6 @@ "Налаштування камери" "Налаштування відеокамери" "Розмір фото" - "13 Мпікс." - "8 Мпікс." - "5 Мпікс." - "4 Мпікс. (16:9)" - "3 Мпікс." - "2 Мпікс." - "2 Мпікс. (16:9)" - "1,5 Мпікс." - "1,3 Mпікс." - "1 Мпікс." - "VGA" - "QVGA" "Режим фокусу" "Авто" "Безкінечність" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index ab352573b..0d4f801d2 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -114,18 +114,6 @@ "Cài đặt máy ảnh" "Cài đặt máy quay video" "Kích thước hình ảnh" - "13M pixel" - "8M pixel" - "5M pixel" - "4M pixel (16:9)" - "3M pixel" - "2M pixel" - "2M pixel (16:9)" - "1,5 M pixel" - "1,3M pixel" - "1M pixel" - "VGA" - "QVGA" "Chế độ tiêu điểm" "Tự động" "Vô cực" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index b7ee237d2..b5ad575a2 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -115,24 +115,6 @@ "相机设置" "摄像机设置" "照片尺寸" - "24M 像素" - "2100 万像素" - "1600 万像素" - "1600 万像素 (16:9)" - "1300万像素" - "1200 万像素" - "800万像素" - "方形 (1:1)" - "500万像素" - "400万像素 (16:9)" - "300万像素" - "200万像素" - "200万像素 (16:9)" - "150万像素" - "130万像素" - "100万像素" - "VGA" - "QVGA" "对焦方式" "自动" "无限远" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index cd335d0a9..0fcf006e1 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -114,18 +114,6 @@ "相機設定" "攝錄機設定" "相片大小" - "1,300 萬像素" - "8 百萬像素" - "5 百萬像素" - "400 萬像素 (16:9)" - "3 百萬像素" - "2 百萬像素" - "2 百萬像素 (16:9)" - "150 萬像素" - "130 萬像素" - "1 百萬像素" - "VGA" - "QVGA" "對焦模式" "自動" "無限" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 11ed532af..8f4c6214a 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -114,18 +114,6 @@ "相機設定" "攝錄影機設定" "圖片大小" - "1300 萬像素" - "800 萬像素" - "500 萬像素" - "400 萬像素 (16:9)" - "300 萬像素" - "200 萬像素" - "200 萬像素 (16:9)" - "150 萬像素" - "130 萬像素" - "100 萬像素" - "VGA" - "QVGA" "對焦模式" "自動" "無限遠" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 90bcfb28e..3d86a3d07 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -114,18 +114,6 @@ "Izilungiselelo zekhamela" "Izilungiselelo zevidiyo-khamela" "Usayizi wesithombe" - "13M amaphikiseli" - "8M amaphikiseli" - "5M amaphikiseli" - "4M amaphikiseli (16:9)" - "3M amaphikiseli" - "2M amaphikiseli" - "2M amaphikiseli (16:9)" - "1.5M amaphikiseli" - "1.3M amaphikiseli" - "1M amaphikiseli" - "I-VGA" - "I-QVGA" "Imodi yefokhasi" "Okuzenzakalelayo" "Kwaphakade" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ec7130af6..2a39275d4 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -28,7 +28,7 @@ @string/pref_video_quality_entry_vga @string/pref_video_quality_entry_cif @string/pref_video_quality_entry_qvga - + 4096x2160 3840x2160 @@ -167,146 +167,6 @@ @string/time_lapse_hours - - - @string/pref_camera_picturesize_entry_24mp - @string/pref_camera_picturesize_entry_21mp - @string/pref_camera_picturesize_entry_16mp - @string/pref_camera_picturesize_entry_16mp_wide - @string/pref_camera_picturesize_entry_13mp - @string/pref_camera_picturesize_entry_12mp - @string/pref_camera_picturesize_entry_8mp - @string/pref_camera_picturesize_entry_8mp - @string/pref_camera_picturesize_entry_square - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_4mp_wide - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_1920x1080 - @string/pref_camera_picturesize_entry_2mp - @string/pref_camera_picturesize_entry_2mp_wide - @string/pref_camera_picturesize_entry_1_5mp - @string/pref_camera_picturesize_entry_1_3mp - @string/pref_camera_picturesize_entry_1280x768 - @string/pref_camera_picturesize_entry_1280x720 - @string/pref_camera_picturesize_entry_1280x400 - @string/pref_camera_picturesize_entry_1mp - @string/pref_camera_picturesize_entry_800x600 - @string/pref_camera_picturesize_entry_800x480 - 960 x 720 - 720 x 480 - @string/pref_camera_picturesize_entry_vga - @string/pref_camera_picturesize_entry_352x288 - @string/pref_camera_picturesize_entry_qvga - - - - 5656x4242 - 5344x4008 - 4608x3456 - 5312x2988 - 4160x3120 - 4000x3000 - 3840x2160 - 3264x2448 - 2976x2976 - 2592x1944 - 2592x1936 - 2560x1920 - 2688x1512 - 2048x1536 - 2048x1520 - 1920x1080 - 1600x1200 - 1920x1088 - 1440x1080 - 1280x960 - 1280x768 - 1280x720 - 1280x400 - 1024x768 - 800x600 - 800x480 - 960x720 - 720x480 - 640x480 - 352x288 - 320x240 - - - - - Auto - @string/pref_camera_picturesize_entry_21mp - @string/pref_camera_picturesize_entry_16mp - @string/pref_camera_picturesize_entry_16mp_wide - @string/pref_camera_picturesize_entry_13mp - @string/pref_camera_picturesize_entry_12mp - @string/pref_camera_picturesize_entry_8mp - @string/pref_camera_picturesize_entry_8mp - @string/pref_camera_picturesize_entry_square - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_4mp_wide - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_1920x1080 - @string/pref_camera_picturesize_entry_2mp - @string/pref_camera_picturesize_entry_2mp_wide - @string/pref_camera_picturesize_entry_1_5mp - @string/pref_camera_picturesize_entry_1_3mp - @string/pref_camera_picturesize_entry_1280x768 - @string/pref_camera_picturesize_entry_1280x720 - @string/pref_camera_picturesize_entry_1mp - @string/pref_camera_picturesize_entry_800x600 - @string/pref_camera_picturesize_entry_800x480 - 960 x 720 - 720 x 480 - @string/pref_camera_picturesize_entry_vga - @string/pref_camera_picturesize_entry_352x288 - @string/pref_camera_picturesize_entry_qvga - - - - - auto - 5344x4008 - 4608x3456 - 5312x2988 - 4160x3120 - 4000x3000 - 3840x2160 - 3264x2448 - 2976x2976 - 2592x1944 - 2592x1936 - 2560x1920 - 2688x1512 - 2048x1536 - 2048x1520 - 1920x1080 - 1600x1200 - 1920x1088 - 1440x1080 - 1280x960 - 1280x768 - 1280x720 - 1024x768 - 800x600 - 800x480 - 960x720 - 720x480 - 640x480 - 352x288 - 320x240 - - @string/pref_camera_focusmode_entry_auto diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml index f28b2d682..066c34c31 100755 --- a/res/values/camera2arrays.xml +++ b/res/values/camera2arrays.xml @@ -433,85 +433,6 @@ 1 - - - @string/pref_camera_picturesize_entry_48mp - @string/pref_camera_picturesize_entry_32mp - @string/pref_camera_picturesize_entry_24mp - @string/pref_camera_picturesize_entry_21mp - 5184 x 3880 - @string/pref_camera_picturesize_entry_16mp - @string/pref_camera_picturesize_entry_16mp_wide - @string/pref_camera_picturesize_entry_13mp - 4208 x 3120 - @string/pref_camera_picturesize_entry_12mp - @string/pref_camera_picturesize_entry_8mp_wide - @string/pref_camera_picturesize_entry_8mp - @string/pref_camera_picturesize_entry_square - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_4mp_wide - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_1920x1080 - @string/pref_camera_picturesize_entry_2mp - @string/pref_camera_picturesize_entry_2mp_wide - @string/pref_camera_picturesize_entry_1_5mp - @string/pref_camera_picturesize_entry_1_3mp - @string/pref_camera_picturesize_entry_1280x768 - @string/pref_camera_picturesize_entry_1280x720 - @string/pref_camera_picturesize_entry_1280x400 - @string/pref_camera_picturesize_entry_1mp - @string/pref_camera_picturesize_entry_800x600 - @string/pref_camera_picturesize_entry_800x480 - @string/pref_camera_picturesize_entry_960x720 - @string/pref_camera_picturesize_entry_720x480 - @string/pref_camera_picturesize_entry_vga - @string/pref_camera_picturesize_entry_352x288 - @string/pref_camera_picturesize_entry_qvga - - - - 8000x6000 - 6560x4928 - 5656x4242 - 5344x4008 - 5184x3880 - 4608x3456 - 5312x2988 - 4160x3120 - 4208x3120 - 4000x3000 - 3840x2160 - 3264x2448 - 2976x2976 - 2592x1944 - 2592x1936 - 2560x1920 - 2688x1512 - 2048x1536 - 2048x1520 - 1920x1080 - 1600x1200 - 1920x1088 - 1440x1080 - 1280x960 - 1280x768 - 1280x720 - 1280x400 - 1024x768 - 800x600 - 800x480 - 960x720 - 720x480 - 640x480 - 352x288 - 320x240 - - @string/pref_camera2_picture_format_entry_0 @string/pref_camera2_picture_format_entry_1 diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 2908dba18..8ce5ba208 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -16,6 +16,22 @@ --> + + 4:3 + 3:2 + 16:10 + 5:3 + 16:9 + 1:1 + + Wide + + + (%1$s) %2$1.1f megapixels + Motion blur reduction Aqua diff --git a/res/values/config.xml b/res/values/config.xml index f0b611fe6..023ce2dd4 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -68,4 +68,6 @@ will be enabled ONLY for these scenemodes and disabled for others. --> + + 900000 diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 70bb5c388..a9bc02a6b 100755 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -809,17 +809,6 @@ enable disable - HD1080 - WXGA - HD720 - 1280 x 400 - SVGA - WVGA - 960 x 720 - 720 x 480 - CIF - QCIF - off diff --git a/res/values/strings.xml b/res/values/strings.xml index 98b5f5b7c..d3e1cb5a5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -273,47 +273,6 @@ Picture size - - 48M pixels - - 32M pixels - - 24M pixels - - 21M pixels - - 16M pixels - - 16M pixels (16:9) - - 13M pixels - - 12M pixels - - 8M pixels - 8M pixels (16:9) - - Square (1:1) - - 5M pixels - - 4M pixels (16:9) - - 3M pixels - - 2M pixels - - 2M pixels (16:9) - - 1.5M pixels - - 1.3M pixels - - 1M pixels - - VGA - - QVGA Focus mode diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 5990ae8ef..68d6d3148 100755 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -70,9 +70,7 @@ + camera:title="@string/pref_camera_picturesize_title" /> diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml index 51b858947..7524388bb 100755 --- a/res/xml/setting_menu_preferences.xml +++ b/res/xml/setting_menu_preferences.xml @@ -84,8 +84,6 @@ android:layout="@layout/preference" android:title="@string/pref_camera_selfiemirror_title" /> + camera:title="@string/pref_camera_picturesize_title" />