Merge branch 'android_ui.lnx.1.2-dev'

Change-Id: Ieb06cc58c083cb03f3dfba07bef506968e36775d

6 files changed, 260 insertions, 0 deletions

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
new file mode 100644
index 000000000..8c13a3422
--- /dev/null
+++ b/res/xml/camera_preferences.xml
@@ -0,0 +1,101 @@
+<?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_camera_settings_category">
+    <IconListPreference
+            camera:key="pref_camera_flashmode_key"
+            camera:defaultValue="@string/pref_camera_flashmode_default"
+            camera:title="@string/pref_camera_flashmode_title"
+            camera:icons="@array/camera_flashmode_icons"
+            camera:largeIcons="@array/camera_flashmode_largeicons"
+            camera:entries="@array/pref_camera_flashmode_entries"
+            camera:entryValues="@array/pref_camera_flashmode_entryvalues"
+            camera:labelList="@array/pref_camera_flashmode_labels" />
+    <IconListPreference
+            camera:key="pref_camera_exposure_key"
+            camera:defaultValue="@string/pref_exposure_default"
+            camera:title="@string/pref_exposure_title"
+            camera:singleIcon="@drawable/ic_exposure_holo_light" />
+    <IconListPreference
+            camera:key="pref_camera_scenemode_key"
+            camera:defaultValue="@string/pref_camera_scenemode_default"
+            camera:title="@string/pref_camera_scenemode_title"
+            camera:singleIcon="@drawable/ic_sce"
+            camera:entries="@array/pref_camera_scenemode_entries"
+            camera:labelList="@array/pref_camera_scenemode_labels"
+            camera:icons="@array/pref_camera_scenemode_icons"
+            camera:largeIcons="@array/pref_camera_scenemode_icons"
+            camera:entryValues="@array/pref_camera_scenemode_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"
+            camera:labelList="@array/pref_camera_whitebalance_labels" />
+    <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:labelList="@array/pref_camera_recordlocation_labels"
+            camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_picturesize_key"
+            camera:title="@string/pref_camera_picturesize_title"
+            camera:entries="@array/pref_camera_picturesize_entries"
+            camera:entryValues="@array/pref_camera_picturesize_entryvalues" />
+    <ListPreference
+            camera:key="pref_camera_focusmode_key"
+            camera:defaultValue="@array/pref_camera_focusmode_default_array"
+            camera:title="@string/pref_camera_focusmode_title"
+            camera:entries="@array/pref_camera_focusmode_entries"
+            camera:labelList="@array/pref_camera_focusmode_labels"
+            camera:entryValues="@array/pref_camera_focusmode_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:labelList="@array/camera_id_labels"
+            camera:largeIcons="@array/camera_id_largeicons" />
+    <IconListPreference
+            camera:key="pref_camera_hdr_key"
+            camera:defaultValue="@string/pref_camera_hdr_default"
+            camera:title="@string/pref_camera_scenemode_entry_hdr"
+            camera:entries="@array/pref_camera_hdr_entries"
+            camera:icons="@array/pref_camera_hdr_icons"
+            camera:largeIcons="@array/pref_camera_hdr_icons"
+            camera:labelList="@array/pref_camera_hdr_labels"
+            camera:entryValues="@array/pref_camera_hdr_entryvalues" />
+    <CountDownTimerPreference
+            camera:key="pref_camera_timer_key"
+            camera:defaultValue="@string/pref_camera_timer_default"
+            camera:title="@string/pref_camera_timer_title" />
+    <ListPreference
+            camera:key="pref_camera_timer_sound_key"
+            camera:defaultValue="@string/pref_camera_timer_sound_default"
+            camera:title="@string/pref_camera_timer_sound_title"
+            camera:entries="@array/pref_camera_timer_sound_entries"
+            camera:entryValues="@array/pref_camera_timer_sound_entryvalues" />
+</PreferenceGroup>
diff --git a/res/xml/device_filter.xml b/res/xml/device_filter.xml
new file mode 100644
index 000000000..36cd13da7
--- /dev/null
+++ b/res/xml/device_filter.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<resources>
+    <!-- filter for PTP devices -->
+    <usb-device class="6" subclass="1" protocol="1" />
+</resources>
diff --git a/res/xml/rtsp_settings_preferences.xml b/res/xml/rtsp_settings_preferences.xml
new file mode 100644
index 000000000..8e26c4d8c
--- /dev/null
+++ b/res/xml/rtsp_settings_preferences.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <PreferenceCategory android:title="@string/rtp_rtcp" >
+        <EditTextPreference
+            android:dialogTitle="@string/set_rtp_min_port"
+            android:inputType="number"
+            android:key="rtp_min_port"
+            android:maxLength="5"
+            android:order="1"
+            android:summary=""
+            android:title="@string/rtp_min_port" />
+        <EditTextPreference
+            android:dialogTitle="@string/rtp_max_port"
+            android:inputType="number"
+            android:key="rtp_max_port"
+            android:maxLength="5"
+            android:order="2"
+            android:summary=""
+            android:title="@string/rtp_max_port" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/buffer_size" >
+        <EditTextPreference
+            android:dialogTitle="@string/set_buffer_size"
+            android:inputType="number"
+            android:key="buffer_size"
+            android:maxLength="10"
+            android:order="5"
+            android:summary=""
+            android:title="@string/buffer_size" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/apn" >
+        <PreferenceScreen
+            android:key="apn"
+            android:title="@string/apn" >
+        </PreferenceScreen>
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml
new file mode 100644
index 000000000..79154e653
--- /dev/null
+++ b/res/xml/video_preferences.xml
@@ -0,0 +1,74 @@
+<?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: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:labelList="@array/pref_camera_video_flashmode_labels"
+            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:labelList="@array/pref_camera_whitebalance_labels"
+            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:labelList="@array/camera_id_labels"
+            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>
diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml
new file mode 100644
index 000000000..759ff6fd4
--- /dev/null
+++ b/res/xml/wallpaper_picker_preview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<wallpaper-preview xmlns:android="http://schemas.android.com/apk/res/android"
+    android:staticWallpaperPreview="@drawable/wallpaper_picker_preview">
+</wallpaper-preview>
diff --git a/res/xml/widget_info.xml b/res/xml/widget_info.xml
new file mode 100644
index 000000000..4aa460f8d
--- /dev/null
+++ b/res/xml/widget_info.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+        android:minWidth="@dimen/appwidget_width"
+        android:minHeight="@dimen/appwidget_height"
+        android:updatePeriodMillis="86400000"
+        android:previewImage="@drawable/preview"
+        android:initialLayout="@layout/appwidget_main"
+        android:configure="com.android.gallery3d.gadget.WidgetConfigure"/>