Remove metering mode support.
Change-Id: I624f611e19c438630bc84778332d13f0357da23f
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cd9e294..9323351 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Nastavení fotoaparátu"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Obnovit výchozí nastavení"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Expozice"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Režim měření"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Vážený střed"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Průměr snímku"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Bod"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Na vaší kartě SD je málo místa. Změňte nastavení kvality nebo smažte položky z Galerie."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Bylo dosaženo limitu velikosti."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 956efa1..fe29540 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Indstillinger for kamera"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Gendan til standarder"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Måletilstand"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Centervægtet"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Billedgennemsnit"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Spot"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Der er snart ikke mere plads på diit SD-kort. Rediger indstillingerne for kvaliteten, eller slet elementer fra Galleriet."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Størrelsesgrænse er nået."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4d5ab1f..19c3531 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Kameraeinstellungen"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Standard wiederherstellen"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Belichtung"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Belichtungsmessung"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Mittenbetont"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Durchschnittliche Frames"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Spot"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Auf Ihrer SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Ändern Sie die Qualitätseinstellung oder löschen Sie Elemente aus der Galerie."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale Größe erreicht"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0f10fe7..bdb816d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Επαναφορά στις προεπιλογές"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Έκθεση"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Τρόπος φωτομέτρησης"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Κεντροσταθμισμένη"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Μέσος όρος καρέ"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Σημείο"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Ο διαθέσιμος χώρος στην κάρτα SD είναι ελάχιστος. Αλλάξτε τη ρύθμιση ποιότητας ή διαγράψτε στοιχεία από τη συλλογή."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Συμπληρώθηκε το όριο μεγέθους."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3fcdc86..d5f7051 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar a configuraciones predeterminadas"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Modo de medición"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Ponderada al centro"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Marco promedio"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Punto"</string>
<string name="details_ok" msgid="6848594369924424312">"Aceptar"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Tu tarjeta SD se está quedando sin espacio. Cambia la configuración de calidad o elimina elementos de la galería."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Se alcanzó el límite del tamaño."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bb27ba7..0118035 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Configuración de cámara"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar a los valores predeterminados"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposición"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Modo de medición"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Ponderada al centro"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Media de marco"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Punto"</string>
<string name="details_ok" msgid="6848594369924424312">"Aceptar"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"No queda espacio en la tarjeta SD. Cambia la configuración de calidad o elimina elementos de la galería."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Se ha alcanzado el límite de tamaño."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 7af3000..f265c3b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Paramètres de l\'appareil photo"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Rétablir les paramètres par défaut"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposition"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Mode de mesure"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Pondérée centrale"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Moyenne"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Spot"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Votre carte SD est pleine. Modifiez le paramètre de qualité ou supprimez des éléments de la galerie."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Taille maximale atteinte."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d3d94cf..736aec5 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Impostazioni fotocamera"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Ripristina predefinite"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Esposizione"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Modalità di misurazione"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Ponderata al centro"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Media"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Spot"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Lo spazio della scheda SD si sta esaurendo. Cambia l\'impostazione di qualità o elimina elementi nella galleria."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Limite di dimensione raggiunto."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a6e941c..66ea853 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"カメラ設定"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"初期設定に戻す"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"露出"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"測光モード"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"中央重点測光"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"多分割測光"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"スポット測光"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"SDカードの容量が足りません。クオリティ設定を変更するか、ギャラリーからアイテムを削除してください。"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"サイズ制限に達しました。"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a12e169..a9d03b6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"카메라 설정"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"기본값으로 복원"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"노출"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"측광 방식"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"중앙부 중점 측광"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"프레임 평균"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"스팟"</string>
<string name="details_ok" msgid="6848594369924424312">"확인"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"SD 카드의 공간이 부족합니다. 화질 설정을 변경하거나 갤러리에서 항목을 삭제하세요."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"크기 한도에 도달했습니다."</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 38a4136..8194709 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Kamerainnstillinger"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Gjenopprett til standardinnstillingene"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Eksponering"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Målemodus"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Sentervektet"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Gjennomsnittlig ramme"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Punkt"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Minnekortet begynner å gå tom for plass. Endre kvalitetsinnstillingen eller slett bilder fra galleriet."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Videoen ble for stor."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 05a0197..d403b2a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Camera-instellingen"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Terugzetten naar standaardwaarden"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Belichting"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Metermodus"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Middelpunt gewogen"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Framegemiddelde"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Punt"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Er is weinig ruimte beschikbaar op uw SD-kaart. U kunt de kwaliteitsinstelling wijzigen of items uit de galerij verwijderen."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Maximale grootte bereikt"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b7b7e59..0361af8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Ustawienia aparatu"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Przywróć wartości domyślne"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Ekspozycja"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Metoda pomiaru"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Centralnie ważony"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Uśredniony z kadru"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Punktowy"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Na karcie SD brakuje miejsca. Zmień ustawienie jakości lub usuń elementy z Galerii."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Osiągnięto limit rozmiaru."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9531c30..c3074e0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Definições da câmara"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar para valores predefinidos"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Modo de medição"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Central ponderada"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Média de fotogramas"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Ponto"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Está a ficar sem espaço no cartão SD. Altere as definições de qualidade ou elimine itens da Galeria."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Limite de tamanho atingido."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f7a7e0f..eea0d90 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Configurações da câmera"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Restaurar para os valores padrão"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exposição"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Modo de medição"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Centralizar"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Média de frames"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Ponto"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"O seu cartão SD está sem espaço. Mude a configuração de qualidade ou exclua itens da Galeria."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Limite de tamanho atingido."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f2185ab..8a02a6f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Настройки камеры"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Заводские настройки"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Экспозиция"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Режим измерения"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Центровзвешенный"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Усредненный"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Точечный"</string>
<string name="details_ok" msgid="6848594369924424312">"ОК"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Место на вашей SD-карте заканчивается. Измените настройки качества или удалите содержимое из галереи."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Достигнут предельный размер видео."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e72b72f..8eb708f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Kamerainställningar"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Återställ standardvärden"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Exponering"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Mätläge"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Centrerad"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Bildrutemedel"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Punkt"</string>
<string name="details_ok" msgid="6848594369924424312">"OK"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"Ditt SD-kort börjar bli fullt. Ändra inställningen för kvalitet eller ta bort objekt från Galleri."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Storleksgränsen nådd."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1b5e45b..e3649ff 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"Kamera ayarları"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"Varsayılan değerleri geri yükle"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"Pozlama"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"Ölçme modu"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"Merkez Ağırlıklı"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"Çerçeve Ortalaması"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"Nokta"</string>
<string name="details_ok" msgid="6848594369924424312">"Tamam"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"SD kartınızda boş alan azalıyor. Kalite ayarlarını değiştirin veya Galeri\'den öğe silin."</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"Boyut sınırına ulaşıldı."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1f7dafe..91f2c7c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"相机设置"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"还原为默认设置"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"测光模式"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"中央重点测光"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"面平均测光"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"点测光"</string>
<string name="details_ok" msgid="6848594369924424312">"确定"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"SD 卡空间已快用完。请更改画质设置或删除图库中的部分内容。"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"已达到大小上限。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 31f9139..daa5463 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -107,10 +107,6 @@
<string name="pref_restore_title" msgid="6479274979730178961">"相機設定"</string>
<string name="pref_restore_detail" msgid="5326039608800383369">"還原成預設值"</string>
<string name="pref_exposure_title" msgid="1229093066434614811">"曝光"</string>
- <string name="pref_camera_meteringmode_title" msgid="4316862664975999393">"測光模式"</string>
- <string name="pref_camera_meteringmode_entry_center_weighted" msgid="6362205429617163588">"中央權重"</string>
- <string name="pref_camera_meteringmode_entry_frame_average" msgid="7462891363691741735">"畫面均化"</string>
- <string name="pref_camera_meteringmode_entry_spot" msgid="3971259987457110980">"點"</string>
<string name="details_ok" msgid="6848594369924424312">"確定"</string>
<string name="spaceIsLow_content" msgid="2848517537672543641">"您的 SD 卡空間已快用完。請變更品質設定或刪除圖庫中的項目。"</string>
<string name="video_reach_size_limit" msgid="6179877322015552390">"已達大小上限。"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 473fb47..2299935 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -261,18 +261,5 @@
<string-array name="pref_camera_quickcapture_entryvalues" translatable="false">
<item>off</item>
<item>on</item>
- </string-array>
-
- <!-- Camera Preferences metering mode dialog box entries -->
- <string-array name="pref_camera_meteringmode_entries" translatable="false">
- <item>@string/pref_camera_meteringmode_entry_center_weighted</item>
- <item>@string/pref_camera_meteringmode_entry_spot</item>
- <item>@string/pref_camera_meteringmode_entry_frame_average</item>
- </string-array>
-
- <string-array name="pref_camera_meteringmode_entryvalues" translatable="false">
- <item>center-weighted</item>
- <item>frame-average</item>
- <item>spot</item>
</string-array>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b908456..e1e37d9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,17 +265,6 @@
<string name="pref_exposure_title">Exposure</string>
<string name="pref_exposure_default" translatable="false">0</string>
- <!-- Default metering mode setting.-->
- <string name="pref_camera_meteringmode_default" translatable="false">center-weighted</string>
-
- <!-- Settings screen, Metering mode title -->
- <string name="pref_camera_meteringmode_title">Metering mode</string>
-
- <!-- Settings screen, Metering mode dialog radio button choices -->
- <string name="pref_camera_meteringmode_entry_center_weighted">Center Weighted</string>
- <string name="pref_camera_meteringmode_entry_frame_average">Frame Average</string>
- <string name="pref_camera_meteringmode_entry_spot">Spot</string>
-
<!-- Framing grid settings in preference -->
<!-- Message to show when there's no lat/lng information in the image -->
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 96eff91..c70c253 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -81,11 +81,5 @@
camera:title="@string/pref_camera_quickcapture_title"
camera:entries="@array/pref_camera_quickcapture_entries"
camera:entryValues="@array/pref_camera_quickcapture_entryvalues" />
- <ListPreference
- camera:key="pref_camera_meteringmode_key"
- camera:defaultValue="@string/pref_camera_meteringmode_default"
- camera:title="@string/pref_camera_meteringmode_title"
- camera:entries="@array/pref_camera_meteringmode_entries"
- camera:entryValues="@array/pref_camera_meteringmode_entryvalues" />
</PreferenceGroup>
</PreferenceGroup>
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 0502d97..cb76226 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1879,14 +1879,6 @@
} else {
mFocusMode = mParameters.getFocusMode();
}
-
- // Set metering mode parameter.
- String meteringMode = mPreferences.getString(
- CameraSettings.KEY_METERING_MODE,
- getString(R.string.pref_camera_meteringmode_default));
- if (isSupported(meteringMode, mParameters.getSupportedMeteringModes())) {
- mParameters.setMeteringMode(meteringMode);
- }
}
// We separate the parameters into several subsets, so we can update only
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index f6b95f6..8eef3e9 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -48,7 +48,6 @@
public static final String KEY_SCENE_MODE = "pref_camera_scenemode_key";
public static final String KEY_QUICK_CAPTURE = "pref_camera_quickcapture_key";
public static final String KEY_EXPOSURE = "pref_camera_exposure_key";
- public static final String KEY_METERING_MODE = "pref_camera_meteringmode_key";
public static final String KEY_CAMERA_ID = "pref_camera_id";
public static final String QUICK_CAPTURE_ON = "on";
@@ -143,8 +142,6 @@
ListPreference exposure = group.findPreference(KEY_EXPOSURE);
ListPreference videoFlashMode =
group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE);
- ListPreference meteringMode =
- group.findPreference(KEY_METERING_MODE);
// Since the screen could be loaded from different resources, we need
// to check if the preference is available here
@@ -192,10 +189,6 @@
filterUnsupportedOptions(group,
videoFlashMode, mParameters.getSupportedFlashModes());
}
- if (meteringMode != null) {
- filterUnsupportedOptions(group,
- meteringMode, mParameters.getSupportedMeteringModes());
- }
if (exposure != null) {
buildExposureCompensation(group, exposure);
diff --git a/src/com/android/camera/ui/CameraHeadUpDisplay.java b/src/com/android/camera/ui/CameraHeadUpDisplay.java
index 3b64faa..9bdb68f 100644
--- a/src/com/android/camera/ui/CameraHeadUpDisplay.java
+++ b/src/com/android/camera/ui/CameraHeadUpDisplay.java
@@ -48,8 +48,7 @@
CameraSettings.KEY_SCENE_MODE,
CameraSettings.KEY_PICTURE_SIZE,
CameraSettings.KEY_JPEG_QUALITY,
- CameraSettings.KEY_COLOR_EFFECT,
- CameraSettings.KEY_METERING_MODE);
+ CameraSettings.KEY_COLOR_EFFECT);
mOtherSettings = new OtherSettingsIndicator(context, prefs);
mOtherSettings.setOnRestorePreferencesClickedRunner(new Runnable() {
