New UI for camcorder.

Change-Id: Id35564836da7b4051662cccfd0920480421499b0

40 files changed, 37 insertions, 216 deletions

diff --git a/res/drawable-hdpi/ic_viewfinder_video_high.png b/res/drawable-hdpi/ic_viewfinder_video_high.png
deleted file mode 100644
index 1a8575b..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_high.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_viewfinder_video_low.png b/res/drawable-hdpi/ic_viewfinder_video_low.png
deleted file mode 100644
index 76f17c7..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_low.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_viewfinder_video_mms.png b/res/drawable-hdpi/ic_viewfinder_video_mms.png
deleted file mode 100644
index 6126f9e..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_mms.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_high.png b/res/drawable-hdpi/ic_viewfinder_video_quality_high.png
new file mode 100644
index 0000000..432cb4a
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_high.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_low.png b/res/drawable-hdpi/ic_viewfinder_video_quality_low.png
new file mode 100644
index 0000000..45ada04
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_low.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_mms.png b/res/drawable-hdpi/ic_viewfinder_video_quality_mms.png
new file mode 100644
index 0000000..9e517df
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_mms.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-hdpi/ic_viewfinder_video_quality_youtube.png
new file mode 100644
index 0000000..296ee75
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_video_quality_youtube.png
diff --git a/res/drawable-hdpi/ic_viewfinder_video_youtube.png b/res/drawable-hdpi/ic_viewfinder_video_youtube.png
deleted file mode 100644
index e354c94..0000000
--- a/res/drawable-hdpi/ic_viewfinder_video_youtube.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_viewfinder_video_high.png b/res/drawable-mdpi/ic_viewfinder_video_high.png
deleted file mode 100644
index e14c7c9..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_high.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_viewfinder_video_low.png b/res/drawable-mdpi/ic_viewfinder_video_low.png
deleted file mode 100644
index 1a706bc..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_low.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_viewfinder_video_mms.png b/res/drawable-mdpi/ic_viewfinder_video_mms.png
deleted file mode 100644
index d952551..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_mms.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_high.png b/res/drawable-mdpi/ic_viewfinder_video_quality_high.png
new file mode 100644
index 0000000..2841baa
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_high.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_low.png b/res/drawable-mdpi/ic_viewfinder_video_quality_low.png
new file mode 100644
index 0000000..ca67404
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_low.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_mms.png b/res/drawable-mdpi/ic_viewfinder_video_quality_mms.png
new file mode 100644
index 0000000..437e412
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_mms.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_quality_youtube.png b/res/drawable-mdpi/ic_viewfinder_video_quality_youtube.png
new file mode 100644
index 0000000..c29a444
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_video_quality_youtube.png
diff --git a/res/drawable-mdpi/ic_viewfinder_video_youtube.png b/res/drawable-mdpi/ic_viewfinder_video_youtube.png
deleted file mode 100644
index c58037e..0000000
--- a/res/drawable-mdpi/ic_viewfinder_video_youtube.png
+++ /dev/null
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 780d4f5..482750c 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -61,26 +61,10 @@
                     android:textSize="23dp"
                     android:textStyle="bold"
                     android:visibility="gone"/>
-            <LinearLayout android:id="@+id/indicator_bar"
-                    android:orientation="vertical"
-                    android:visibility="visible"
-                    android:gravity="center"
-                    android:layout_gravity="left|bottom"
-                    android:layout_marginBottom="60dp"
-                    android:layout_marginLeft="13dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/flash_icon"
-                        camera:modes="@array/flash_modes"
-                        camera:icons="@array/flash_icons"/>
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/whitebalance_icon"
-                        camera:modes="@array/pref_camera_whitebalance_entryvalues"
-                        camera:icons="@array/whitebalance_icons"/>
-            </LinearLayout>
+            <com.android.camera.ui.GLRootView
+                    android:id="@+id/settings_ui"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
         </FrameLayout>
     </com.android.camera.PreviewFrameLayout>
 </LinearLayout>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 30f6658..c33fa4f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Úložiště"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Vypnuto"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Zapnout"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Kvalita videa"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Nízká (pro zprávy MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Vysoká (pro kartu SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Délka videa"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> s (pro MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 min"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 min"</string>
     <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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e3a4904..80a4ff2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lagringsplacering"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Fra"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Til"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videokvalitet"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Lav (til mms-beskeder)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Høj (til SD-kort)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Varighed på video"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> sekunder (til mms)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutter"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutter"</string>
     <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>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ecffd23..a6e2778 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Ort speichern"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Aus"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"An"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videoqualität"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Niedrig (für MMS-Mitteilungen)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Hoch (für SD-Karte)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Videodauer"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> Sekunden (für MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 Minuten"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 Minuten"</string>
     <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>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index f1fdf24..3116adb 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Αποθήκευση τοποθεσίας"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Ενεργοποιημένο"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Ποιότητα βίντεο"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Χαμηλή (για μηνύματα MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Υψηλή (για κάρτα SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Διάρκεια βίντεο"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> δευτερόλεπτα (για MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 λεπτά"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 λεπτά"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Ρυθμίσεις φωτογραφικής μηχανής"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Ρυθμίσεις βιντεοκάμερας"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Μέγεθος εικόνας"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0608ffd..1945f96 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Ubicación de tienda"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Apagado"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Encendido"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Calidad del video"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Bajo (para mensajes MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (para tarjeta SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Duración del video"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> segundos (por MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 853e887..d04769a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Almacenar ubicación"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desactivada"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activada"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Calidad de vídeo"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Baja (para mensajes MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (para tarjeta SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Duración de vídeo"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> segundos (para MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Configuración de cámara"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Configuración de videocámara"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Tamaño de imagen"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3068915..fffb602 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Enregistrer la position"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Désactivé"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activé"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualité vidéo"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Basse (MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Haute (carte SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Durée de la vidéo"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> secondes (MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutes"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutes"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Paramètres de l\'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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index bb6420b..f553f67 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Registra località"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Non attiva"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Attiva"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualità video"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Bassa (per MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (per scheda SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Durata video"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> secondi (per MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minuti"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minuti"</string>
     <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>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 16f801f..efe5801 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"位置情報を記録する"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"OFF"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"ON"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"画質"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"低（メール添付向け）"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"高 (SDカード向け)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"動画の再生時間"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g>秒（MMS）"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10分"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30分"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"カメラ設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"ビデオ録画設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"表示サイズ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7f36b5d..eb6ffce 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"저장 위치"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"사용 안함"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"사용"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"동영상 화질"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"저화질(MMS 메시지용)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"높음(SD 카드용)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"동영상 길이"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g>초(MMS용)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10분"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30분"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"카메라 설정"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"캠코더 설정"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"사진 크기"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 56cfd9c..a030b69 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lagre sted i bilder"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Av"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"På"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videokvalitet"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Lav (for MMS-meldinger)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Høy (for minnekort)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Videolengde"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> sekunder (for MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutter"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutter"</string>
     <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>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8ef6f3c..557cafe 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Locatie opslaan"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Uit"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Aan"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videokwaliteit"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Laag (voor MMS-berichten)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Hoog (voor SD-kaart)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Duur van video"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> seconden (voor MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minuten"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minuten"</string>
     <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>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 06fd3b7..33b3674 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Lokalizacja przechowywania"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Wyłączona"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Włączona"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Jakość filmu wideo"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Niska (dla wiadomości MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Wysoka (dla karty SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Czas trwania filmu wideo"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> s (dla wiadomości MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minut"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minut"</string>
     <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>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dac9346..dc3f4bb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Armazenar localização"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desactivado"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Activado"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualidade de vídeo"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Baixa (para mensagens MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (para cartão SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Duração do vídeo"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> segundos (para MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <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>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1d3797a..6d89cc8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Local de armazenamento"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Desativado"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Ativado"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Qualidade do vídeo"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Baixa (para mensagens MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Alta (para cartão SD)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Duração do vídeo"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> segundos (para MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minutos"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minutos"</string>
     <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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b719f1c..dc970de 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Записывать местоположение"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Выкл."</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Вкл."</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Качество видео"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Низкое (для сообщений MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Высокое (для SD-карты)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Длительность видео"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> с. (для MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 минут"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 минут"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"Настройки камеры"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"Настройки видеокамеры"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"Размер фотографии"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f4114a2..88756b0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Spara plats"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Av"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"På"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Videokvalitet"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Låg (för MMS)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Hög (för SD-kort)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Videoklippets längd"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> sekunder (för MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 minuter"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 minuter"</string>
     <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8428fda..8545743 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"Depo konumu"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"Kapalı"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"Açık"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"Video kalitesi"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"Düşük (MMS mesajları için)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"Yüksek (SD kart için)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"Video süresi"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> saniye (MMS için)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 dakika"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 dakika"</string>
     <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>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eabfe3b..3486b7f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"存储位置"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"关"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"开"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"视频画质"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"低（适用于彩信）"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"高（适用于 SD 卡）"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"视频时长"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> 秒（对于彩信）"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 分钟"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 分钟"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相机设置"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"摄像机设置"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"照片大小"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3858159..143ecdb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -51,13 +51,6 @@
     <string name="pref_camera_recordlocation_title" msgid="371208839215448917">"儲存位置"</string>
     <string name="pref_camera_recordlocation_entry_off" msgid="8888142742988946038">"關閉"</string>
     <string name="pref_camera_recordlocation_entry_on" msgid="7954533529969575594">"開啟"</string>
-    <string name="pref_camera_videoquality_title" msgid="4127153321803677407">"影片品質"</string>
-    <string name="pref_camera_videoquality_entry_0" msgid="6300182041472826848">"低 (適用於多媒體簡訊)"</string>
-    <string name="pref_camera_videoquality_entry_1" msgid="6742349839919099735">"高 (適用於 SD 卡)"</string>
-    <string name="pref_camera_video_duration_title" msgid="8049279326917441484">"影片長度"</string>
-    <string name="pref_camera_video_duration_entry_mms" msgid="9067623003661464481">"<xliff:g id="DURATION">%1$d</xliff:g> 秒 (MMS)"</string>
-    <string name="pref_camera_video_duration_entry_10" msgid="664455443394175885">"10 分鐘"</string>
-    <string name="pref_camera_video_duration_entry_30" msgid="1197298883102352735">"30 分鐘"</string>
     <string name="pref_camera_settings_category" msgid="2576236450859613120">"相機設定"</string>
     <string name="pref_camcorder_settings_category" msgid="460313486231965141">"攝錄影機設定"</string>
     <string name="pref_camera_picturesize_title" msgid="4333724936665883006">"相片大小"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 42b80f4..34dbcb6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -16,30 +16,27 @@
  -->
 
 <resources>
-    <!-- Camera Preferences Video Quality dialog box entries -->
-    <string-array name="pref_camera_videoquality_entries" translatable="false">
-        <item>@string/pref_camera_videoquality_entry_0</item>
-        <item>@string/pref_camera_videoquality_entry_1</item>
+    <!-- Camera Preferences Video Quality entries -->
+    <string-array name="pref_video_quality_entries" translatable="false">
+        <item>@string/pref_video_quality_entry_high</item>
+        <item>@string/pref_video_quality_entry_low</item>
+        <item>@string/pref_video_quality_entry_mms</item>
+        <item>@string/pref_video_quality_entry_youtube</item>
     </string-array>
 
-    <string-array name="pref_camera_videoquality_entryvalues" translatable="false">
-        <item>0</item>
-        <item>1</item>
+    <string-array name="pref_video_quality_entryvalues" translatable="false">
+        <item>high</item>
+        <item>low</item>
+        <item>mms</item>
+        <item>youtube</item>
     </string-array>
 
-    <!-- Camera Preferences Video Duration dialog box entries -->
-    <string-array name="pref_camera_video_duration_entries" translatable="false">
-        <item>@string/pref_camera_video_duration_entry_mms</item>
-        <item>@string/pref_camera_video_duration_entry_10</item>
-        <item>@string/pref_camera_video_duration_entry_30</item>
-    </string-array>
-
-    <!-- The numbers are in minutes, except -1 means the duration suitable for mms. -->
-    <string-array name="pref_camera_video_duration_entryvalues" translatable="false">
-        <item>-1</item>
-        <item>10</item>
-        <item>30</item>
-    </string-array>
+    <array name="video_quality_icons" translatable="false">
+        <item>@drawable/ic_viewfinder_video_quality_high</item>
+        <item>@drawable/ic_viewfinder_video_quality_low</item>
+        <item>@drawable/ic_viewfinder_video_quality_mms</item>
+        <item>@drawable/ic_viewfinder_video_quality_youtube</item>
+    </array>
 
     <!-- Camera Preferences Picture size dialog box entries -->
     <string-array name="pref_camera_picturesize_entries" translatable="false">
@@ -148,6 +145,11 @@
         <item>@drawable/ic_menuselect_flash_off</item>
     </array>
 
+    <array name="video_flashmode_icons">
+        <item>@drawable/ic_viewfinder_flash_on</item>
+        <item>@drawable/ic_viewfinder_flash_off</item>
+    </array>
+
     <string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
         <item>off</item>
         <item>on</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 59b7ea3..26ff93f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -124,31 +124,9 @@
     <string name="pref_camera_recordlocation_entry_off">Off</string>
     <string name="pref_camera_recordlocation_entry_on">On</string>
 
-    <!-- Default video quality setting. A numerical value. -->
-    <string name="pref_camera_videoquality_default" translatable="false">1</string>
-
-    <!-- Settings screen, Video quality title -->
-    <string name="pref_camera_videoquality_title">Video quality</string>
-
-    <!-- Settings screen, Video quality dialog radio button choices -->
-    <string name="pref_camera_videoquality_entry_0">Low (for MMS messages)</string>
-    <string name="pref_camera_videoquality_entry_1">High (for SD card)</string>
-
-    <!-- Default video duration setting. A numerical value.-->
-    <string name="pref_camera_video_duration_default" translatable="false">10</string>
-
-    <!-- Settings screen, Video duration title -->
-    <string name="pref_camera_video_duration_title">Video duration</string>
-
-    <!-- Settings screen, Video duration dialog radio button choices -->
-    <string name="pref_camera_video_duration_entry_mms">
-        <xliff:g id="duration" example="60">%1$d</xliff:g> seconds (for MMS)
-    </string>
-    <string name="pref_camera_video_duration_entry_10">10 minutes</string>
-    <string name="pref_camera_video_duration_entry_30">30 minutes</string>
-
     <!-- The Video length settings in preference -->
     <string name="pref_video_quality_title">Video quality</string>
+    <string name="pref_video_quality_default" translatable="false">high</string>
     <string name="pref_video_quality_entry_high">High (30m)</string>
     <string name="pref_video_quality_entry_low">Low (30m)</string>
     <string name="pref_video_quality_entry_mms">MMS (Low, 30s)</string>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index 677a9b9..eb8e344 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -17,24 +17,20 @@
 <PreferenceGroup
         xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" >
     <PreferenceGroup
-        camera:title="@string/pref_camcorder_settings_category">
-        <ListPreference
-                camera:key="pref_camera_videoquality_key"
-                camera:defaultValue="@string/pref_camera_videoquality_default"
-                camera:title="@string/pref_camera_videoquality_title"
-                camera:entries="@array/pref_camera_videoquality_entries"
-                camera:entryValues="@array/pref_camera_videoquality_entryvalues"/>
-        <ListPreference
-                camera:key="pref_camera_video_duration_key"
-                camera:defaultValue="@string/pref_camera_video_duration_default"
-                camera:title="@string/pref_camera_video_duration_title"
-                camera:entries="@array/pref_camera_video_duration_entries"
-                camera:entryValues="@array/pref_camera_video_duration_entryvalues"/>
+            camera:title="@string/pref_camcorder_settings_category">
+        <IconListPreference
+                camera:key="pref_video_quality_key"
+                camera:defaultValue="@string/pref_video_quality_default"
+                camera:title="@string/pref_video_quality_title"
+                camera:largeIcons="@array/video_quality_icons"
+                camera:entries="@array/pref_video_quality_entries"
+                camera:entryValues="@array/pref_video_quality_entryvalues"/>
         <IconListPreference
                 camera:key="pref_camera_video_flashmode_key"
                 camera:defaultValue="@string/pref_camera_video_flashmode_default"
                 camera:title="@string/pref_camera_flashmode_title"
                 camera:icons="@array/pref_camera_video_flashmode_icons"
+                camera:largeIcons="@array/video_flashmode_icons"
                 camera:entries="@array/pref_camera_video_flashmode_entries"
                 camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
         <IconListPreference
@@ -42,6 +38,7 @@
                 camera:defaultValue="@string/pref_camera_whitebalance_default"
                 camera:title="@string/pref_camera_whitebalance_title"
                 camera:icons="@array/pref_camera_whitebalance_icons"
+                camera:largeIcons="@array/whitebalance_icons"
                 camera:entries="@array/pref_camera_whitebalance_entries"
                 camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
         <ListPreference