auto import from //branches/cupcake/...@131421

16 files changed, 81 insertions, 18 deletions

diff --git a/res/drawable/photo_frame.9.png b/res/drawable/photo_frame.9.png
new file mode 100644
index 0000000..b153260
--- /dev/null
+++ b/res/drawable/photo_frame.9.png
diff --git a/res/layout/photo_frame.xml b/res/layout/photo_frame.xml
new file mode 100644
index 0000000..5537b1e
--- /dev/null
+++ b/res/layout/photo_frame.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.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/photo"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:scaleType="center"
+    android:cropToPadding="true"
+    android:background="@drawable/photo_frame"
+    />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8062838..09489cd 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 12a4f88..7d309b0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b826de9..17dffa7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d2c6e3d..6afc9ca 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 15f6136..27183e2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 329e51b..9f6baf9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 72e8d2e..33f5ec0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1ec9c8a..7359acf 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -29,8 +29,7 @@
     <string name="wait">"Vent litt…"</string>
     <string name="no_storage">"Sett inn et minnekort før du bruker kameraet."</string>
     <string name="not_enough_space">"Minnekortet er fullt."</string>
-    <!-- no translation found for preparing_sd (2914969119574812666) -->
-    <skip />
+    <string name="preparing_sd">"Forbereder minnekort…"</string>
     <string name="wallpaper">"Setter bakgrunnsbilde, vent litt…"</string>
     <string name="savingImage">"Lagrer bilde…"</string>
     <string name="runningFaceDetection">"Vent litt…"</string>
@@ -50,15 +49,12 @@
     <string name="confirm_delete_message">"Bildet vil bli slettet."</string>
     <string name="confirm_delete_video_message">"Videoen vil bli slettet."</string>
     <string name="camera_toss">"Slett"</string>
-    <!-- no translation found for camera_gallery (815753042966032398) -->
-    <skip />
+    <string name="camera_gallery">"Galleri"</string>
     <string name="camera_share">"Del"</string>
     <string name="camera_set">"Bruk som"</string>
     <string name="camera_play">"Spill"</string>
-    <!-- no translation found for camera_attach (4048659554893435232) -->
-    <skip />
-    <!-- no translation found for camera_cancel (8203341746672085747) -->
-    <skip />
+    <string name="camera_attach">"Legg ved"</string>
+    <string name="camera_cancel">"Avbryt"</string>
     <string name="camera_crop">"Beskjær"</string>
     <string name="camera_tossing">"Sletter…"</string>
     <string name="no_way_to_share_image">"Bildet kan ikke deles."</string>
@@ -146,16 +142,11 @@
     <string name="loading_video">"Laster video…"</string>
     <string name="spaceIsLow_title">"Lite plass"</string>
     <string name="spaceIsLow_content">"Minnekortet begynner å gå tom for plass. Endre kvalitetsinnstillingen eller slett bilder fra galleriet."</string>
-    <!-- no translation found for resume_playing_title (8996677350649355013) -->
-    <skip />
-    <!-- no translation found for resume_playing_message (5184414518126703481) -->
-    <skip />
-    <!-- no translation found for resume_playing_resume (3847915469173852416) -->
-    <skip />
-    <!-- no translation found for resume_playing_restart (5471008499835769292) -->
-    <skip />
-    <!-- no translation found for gadget_title (259405922673466798) -->
-    <skip />
+    <string name="resume_playing_title">"Fortsett avspilling"</string>
+    <string name="resume_playing_message">"Fortsett avspilling fra %s?"</string>
+    <string name="resume_playing_resume">"Fortsett avspilling"</string>
+    <string name="resume_playing_restart">"Begynn på nytt"</string>
+    <string name="gadget_title">"Bilderamme"</string>
     <!-- no translation found for video_file_name_format (8555507706353616970) -->
     <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9f7aa3b..5d3740d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 882ae3b..9081af4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ef3b196..06fbbaa 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 324c9e6..eba681b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c3243ca..14ff0eb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -175,4 +175,6 @@
     <skip />
     <!-- no translation found for gadget_title (259405922673466798) -->
     <skip />
+    <!-- no translation found for video_file_name_format (8555507706353616970) -->
+    <skip />
 </resources>
diff --git a/res/xml/gadget_info.xml b/res/xml/gadget_info.xml
new file mode 100644
index 0000000..05fb515
--- /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="148px"
+    android:minHeight="148px"
+    android:updatePeriodMillis="0"
+    android:initialLayout="@layout/photo_frame"
+    android:configure="com.android.camera.PhotoGadgetConfigure"
+    >
+</gadget-provider>