From 3148b18958ea240e9ac7aac90f16ba1d3df0519f Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 29 Jan 2013 14:03:06 -0800
Subject: Copy camera resources into Gallery2

Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
---
 res/xml/video_preferences.xml | 72 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 res/xml/video_preferences.xml

(limited to 'res/xml/video_preferences.xml')

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
new file mode 100644
index 000000000..d0671ebdb
--- /dev/null
+++ b/res/xml/video_preferences.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceGroup
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.gallery3d"
+        camera:title="@string/pref_camcorder_settings_category">
+    <ListPreference
+            camera:key="pref_video_quality_key"
+            camera:defaultValue="@string/pref_video_quality_default"
+            camera:title="@string/pref_video_quality_title"
+            camera:entries="@array/pref_video_quality_entries"
+            camera:entryValues="@array/pref_video_quality_entryvalues"/>
+    <IconListPreference
+            camera:key="pref_video_time_lapse_frame_interval_key"
+            camera:defaultValue="@string/pref_video_time_lapse_frame_interval_default"
+            camera:title="@string/pref_video_time_lapse_frame_interval_title"
+            camera:singleIcon="@drawable/ic_timelapse_none"
+            camera:entries="@array/pref_video_time_lapse_frame_interval_entries"
+            camera:entryValues="@array/pref_video_time_lapse_frame_interval_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/video_flashmode_icons"
+            camera:largeIcons="@array/video_flashmode_largeicons"
+            camera:entries="@array/pref_camera_video_flashmode_entries"
+            camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
+    <IconListPreference
+            camera:key="pref_camera_whitebalance_key"
+            camera:defaultValue="@string/pref_camera_whitebalance_default"
+            camera:title="@string/pref_camera_whitebalance_title"
+            camera:icons="@array/whitebalance_icons"
+            camera:largeIcons="@array/whitebalance_largeicons"
+            camera:entries="@array/pref_camera_whitebalance_entries"
+            camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
+    <IconListPreference
+            camera:key="pref_camera_id_key"
+            camera:defaultValue="@string/pref_camera_id_default"
+            camera:title="@string/pref_camera_id_title"
+            camera:icons="@array/camera_id_icons"
+            camera:entries="@array/camera_id_entries"
+            camera:largeIcons="@array/camera_id_largeicons"/>
+    <IconListPreference
+            camera:key="pref_video_effect_key"
+            camera:defaultValue="@string/pref_video_effect_default"
+            camera:title="@string/pref_video_effect_title"
+            camera:icons="@array/video_effect_icons"
+            camera:largeIcons="@array/video_effect_icons"
+            camera:entries="@array/pref_video_effect_entries"
+            camera:entryValues="@array/pref_video_effect_entryvalues" />
+    <RecordLocationPreference
+            camera:key="pref_camera_recordlocation_key"
+            camera:defaultValue="@string/pref_camera_recordlocation_default"
+            camera:title="@string/pref_camera_recordlocation_title"
+            camera:icons="@array/camera_recordlocation_icons"
+            camera:largeIcons="@array/camera_recordlocation_largeicons"
+            camera:entries="@array/pref_camera_recordlocation_entries"
+            camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
+</PreferenceGroup>
-- 
cgit v1.2.3


From 1ec05e293169416dd369f2df78d3af2df5fd392f Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Mon, 15 Apr 2013 13:17:27 -0700
Subject: Also, add labels to video menu

  Bug: 8618169

Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
---
 res/xml/video_preferences.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'res/xml/video_preferences.xml')

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index d0671ebdb..a5d9fc8a0 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -37,6 +37,7 @@
             camera:icons="@array/video_flashmode_icons"
             camera:largeIcons="@array/video_flashmode_largeicons"
             camera:entries="@array/pref_camera_video_flashmode_entries"
+            camera:labels="@array/pref_camera_video_flashmode_labels"
             camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_whitebalance_key"
@@ -45,6 +46,7 @@
             camera:icons="@array/whitebalance_icons"
             camera:largeIcons="@array/whitebalance_largeicons"
             camera:entries="@array/pref_camera_whitebalance_entries"
+            camera:labels="@array/pref_camera_whitebalance_labels"
             camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_id_key"
@@ -52,6 +54,7 @@
             camera:title="@string/pref_camera_id_title"
             camera:icons="@array/camera_id_icons"
             camera:entries="@array/camera_id_entries"
+            camera:labels="@array/camera_id_labels"
             camera:largeIcons="@array/camera_id_largeicons"/>
     <IconListPreference
             camera:key="pref_video_effect_key"
-- 
cgit v1.2.3


From f8602430548c07a35b91f16b134bb0fcc007cbbe Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 18 Apr 2013 10:15:40 -0700
Subject: Change labels so that it doesn't clash with PanoUiLib.

  Bug 8401273
  PanoUiLib is required for all Gallery Wolfie UI.

Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
---
 res/xml/video_preferences.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res/xml/video_preferences.xml')

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index a5d9fc8a0..faf5f655b 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -37,7 +37,7 @@
             camera:icons="@array/video_flashmode_icons"
             camera:largeIcons="@array/video_flashmode_largeicons"
             camera:entries="@array/pref_camera_video_flashmode_entries"
-            camera:labels="@array/pref_camera_video_flashmode_labels"
+            camera:labelList="@array/pref_camera_video_flashmode_labels"
             camera:entryValues="@array/pref_camera_video_flashmode_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_whitebalance_key"
@@ -46,7 +46,7 @@
             camera:icons="@array/whitebalance_icons"
             camera:largeIcons="@array/whitebalance_largeicons"
             camera:entries="@array/pref_camera_whitebalance_entries"
-            camera:labels="@array/pref_camera_whitebalance_labels"
+            camera:labelList="@array/pref_camera_whitebalance_labels"
             camera:entryValues="@array/pref_camera_whitebalance_entryvalues"/>
     <IconListPreference
             camera:key="pref_camera_id_key"
@@ -54,7 +54,7 @@
             camera:title="@string/pref_camera_id_title"
             camera:icons="@array/camera_id_icons"
             camera:entries="@array/camera_id_entries"
-            camera:labels="@array/camera_id_labels"
+            camera:labelList="@array/camera_id_labels"
             camera:largeIcons="@array/camera_id_largeicons"/>
     <IconListPreference
             camera:key="pref_video_effect_key"
-- 
cgit v1.2.3


From c2556da9f89da81e5a1987bd898f6d0fb4c4bfaf Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Wed, 31 Jul 2013 11:25:09 -0700
Subject: Set default video quality to the highest

Bug: 9886141

Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
---
 res/xml/video_preferences.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/xml/video_preferences.xml')

diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
index faf5f655b..79154e653 100644
--- a/res/xml/video_preferences.xml
+++ b/res/xml/video_preferences.xml
@@ -19,7 +19,6 @@
         camera:title="@string/pref_camcorder_settings_category">
     <ListPreference
             camera:key="pref_video_quality_key"
-            camera:defaultValue="@string/pref_video_quality_default"
             camera:title="@string/pref_video_quality_title"
             camera:entries="@array/pref_video_quality_entries"
             camera:entryValues="@array/pref_video_quality_entryvalues"/>
-- 
cgit v1.2.3