auto import from //depot/cupcake/@135843

3 files changed, 155 insertions, 0 deletions

diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
new file mode 100644
index 0000000..4d8b7b7
--- /dev/null
+++ b/res/xml/camera_preferences.xml
@@ -0,0 +1,42 @@
+<?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.
+-->
+
+<!-- This is a primitive example showing the different types of preferences available. -->
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+      android:title="@string/pref_camera_general_settings_category">
+
+        <CheckBoxPreference
+                android:key="pref_camera_recordlocation_key"
+                android:title="@string/pref_camera_recordlocation_title"
+                android:summary="@string/pref_camera_recordlocation_summary"
+                android:defaultValue="false"/>
+    </PreferenceCategory>
+    
+    <PreferenceCategory
+      android:title="@string/pref_camera_videoquality_category">
+        <!-- android:summary is filled in by CameraSettings -->
+        <ListPreference
+                android:key="pref_camera_videoquality_key"
+                android:defaultValue="@string/pref_camera_videoquality_default"
+                android:title="@string/pref_camera_videoquality_title"
+                android:entries="@array/pref_camera_videoquality_entries"
+                android:entryValues="@array/pref_camera_videoquality_entryvalues"
+                android:dialogTitle="@string/pref_camera_videoquality_dialogtitle" />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/gadget_info.xml b/res/xml/gadget_info.xml
new file mode 100644
index 0000000..5efaddd
--- /dev/null
+++ b/res/xml/gadget_info.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<gadget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="146dip"
+    android:minHeight="146dip"
+    android:updatePeriodMillis="0"
+    android:initialLayout="@layout/photo_frame"
+    android:configure="com.android.camera.PhotoGadgetConfigure"
+    >
+</gadget-provider>
diff --git a/res/xml/gallery_preferences.xml b/res/xml/gallery_preferences.xml
new file mode 100644
index 0000000..0ddc166
--- /dev/null
+++ b/res/xml/gallery_preferences.xml
@@ -0,0 +1,89 @@
+<?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.
+-->
+
+<!-- This is a primitive example showing the different types of preferences available. -->
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+            android:title="@string/pref_gallery_category">
+            
+        <ListPreference
+                android:key="pref_gallery_size_key"
+                android:title="@string/pref_gallery_size_title"
+                android:summary="@string/pref_gallery_size_summary"
+                android:entries="@array/pref_gallery_size_choices"
+                android:entryValues="@array/pref_gallery_size_values"
+                android:dialogTitle="@string/pref_gallery_size_dialogtitle"
+                android:defaultValue="@string/default_value_pref_gallery_size" />
+
+        <ListPreference
+                android:key="pref_gallery_sort_key"
+                android:title="@string/pref_gallery_sort_title"
+                android:summary="@string/pref_gallery_sort_summary"
+                android:entries="@array/pref_gallery_sort_choices"
+                android:entryValues="@array/pref_gallery_sort_values"
+                android:dialogTitle="@string/pref_gallery_sort_dialogtitle"
+                android:defaultValue="@string/default_value_pref_gallery_sort" />
+
+        <CheckBoxPreference
+                android:key="pref_gallery_confirm_delete_key"
+                android:title="@string/pref_gallery_confirm_delete_title"
+                android:summary="@string/pref_gallery_confirm_delete_summary"
+                android:defaultValue="true"/>
+<!--
+        <EditTextPreference
+                android:key="pref_camera_upload_albumname_key"
+                android:title="@string/pref_camera_upload_albumname_title"
+                android:summary="@string/pref_camera_upload_albumname_summary"
+                android:dialogTitle="@string/pref_camera_upload_albumname_dialogtitle"
+                android:singleLine="true" />
+-->                
+    </PreferenceCategory>
+    <PreferenceCategory
+      android:title="@string/pref_slideshow_category">
+        <ListPreference
+                android:key="pref_gallery_slideshow_interval_key"
+                android:title="@string/pref_gallery_slideshow_interval_title"
+                android:summary="@string/pref_gallery_slideshow_interval_summary"
+                android:entries="@array/pref_gallery_slideshow_interval_choices"
+                android:entryValues="@array/pref_gallery_slideshow_interval_values"
+                android:dialogTitle="@string/pref_gallery_slideshow_interval_dialogtitle"
+                android:defaultValue="@string/default_value_pref_gallery_slideshow_interval" />
+
+        <ListPreference
+                android:key="pref_gallery_slideshow_transition_key"
+                android:title="@string/pref_gallery_slideshow_transition_title"
+                android:summary="@string/pref_gallery_slideshow_transition_summary"
+                android:entries="@array/pref_gallery_slideshow_transition_choices"
+                android:entryValues="@array/pref_gallery_slideshow_transition_values"
+                android:dialogTitle="@string/pref_gallery_slideshow_transition_dialogtitle"
+                android:defaultValue="@string/default_value_pref_gallery_slideshow_transition" />
+
+        <CheckBoxPreference
+                android:key="pref_gallery_slideshow_repeat_key"
+                android:title="@string/pref_gallery_slideshow_repeat_title"
+                android:summary="@string/pref_gallery_slideshow_repeat_summary"
+                android:defaultValue="false"/>
+
+        <CheckBoxPreference
+                android:key="pref_gallery_slideshow_shuffle_key"
+                android:title="@string/pref_gallery_slideshow_shuffle_title"
+                android:summary="@string/pref_gallery_slideshow_shuffle_summary"
+                android:defaultValue="false"/>
+
+    </PreferenceCategory>
+</PreferenceScreen>