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

57 files changed, 355 insertions, 19 deletions

diff --git a/res/drawable/bg_gadget_error.9.png b/res/drawable/bg_gadget_error.9.png
new file mode 100644
index 000000000..507742471
--- /dev/null
+++ b/res/drawable/bg_gadget_error.9.png
diff --git a/res/drawable/ic_launcher_alarmclock.png b/res/drawable/ic_launcher_alarmclock.png
deleted file mode 100755
index 30ff2671a..000000000
--- a/res/drawable/ic_launcher_alarmclock.png
+++ /dev/null
diff --git a/res/drawable/ic_launcher_application.png b/res/drawable/ic_launcher_application.png
new file mode 100644
index 000000000..75024841d
--- /dev/null
+++ b/res/drawable/ic_launcher_application.png
diff --git a/res/drawable/ic_launcher_empty.png b/res/drawable/ic_launcher_empty.png
new file mode 100644
index 000000000..59bb6c506
--- /dev/null
+++ b/res/drawable/ic_launcher_empty.png
diff --git a/res/drawable/ic_launcher_gadget.png b/res/drawable/ic_launcher_gadget.png
new file mode 100644
index 000000000..cb40a1988
--- /dev/null
+++ b/res/drawable/ic_launcher_gadget.png
diff --git a/res/drawable/wallpaper.jpg b/res/drawable/wallpaper.jpg
deleted file mode 100644
index d19b64282..000000000
--- a/res/drawable/wallpaper.jpg
+++ /dev/null
diff --git a/res/drawable/wallpaper_beach.jpg b/res/drawable/wallpaper_beach.jpg
index c059cc3db..bdcece08c 100644
--- a/res/drawable/wallpaper_beach.jpg
+++ b/res/drawable/wallpaper_beach.jpg
diff --git a/res/drawable/wallpaper_beach_small.jpg b/res/drawable/wallpaper_beach_small.jpg
index 350850935..46051cc4e 100644
--- a/res/drawable/wallpaper_beach_small.jpg
+++ b/res/drawable/wallpaper_beach_small.jpg
diff --git a/res/drawable/wallpaper_blue.jpg b/res/drawable/wallpaper_blue.jpg
index 032f59818..0edd6bda8 100644
--- a/res/drawable/wallpaper_blue.jpg
+++ b/res/drawable/wallpaper_blue.jpg
diff --git a/res/drawable/wallpaper_blue_small.jpg b/res/drawable/wallpaper_blue_small.jpg
index e987c69dc..5cf585a0e 100644
--- a/res/drawable/wallpaper_blue_small.jpg
+++ b/res/drawable/wallpaper_blue_small.jpg
diff --git a/res/drawable/wallpaper_green.jpg b/res/drawable/wallpaper_green.jpg
index 89b308b14..36c9e08d7 100644
--- a/res/drawable/wallpaper_green.jpg
+++ b/res/drawable/wallpaper_green.jpg
diff --git a/res/drawable/wallpaper_green_small.jpg b/res/drawable/wallpaper_green_small.jpg
index 16790d2a0..d7c28ec1e 100644
--- a/res/drawable/wallpaper_green_small.jpg
+++ b/res/drawable/wallpaper_green_small.jpg
diff --git a/res/drawable/wallpaper_grey.jpg b/res/drawable/wallpaper_grey.jpg
index 7898568cf..ca48e6afc 100644
--- a/res/drawable/wallpaper_grey.jpg
+++ b/res/drawable/wallpaper_grey.jpg
diff --git a/res/drawable/wallpaper_grey_small.jpg b/res/drawable/wallpaper_grey_small.jpg
index 12ca3e22b..1734d2e96 100644
--- a/res/drawable/wallpaper_grey_small.jpg
+++ b/res/drawable/wallpaper_grey_small.jpg
diff --git a/res/drawable/wallpaper_jellyfish.jpg b/res/drawable/wallpaper_jellyfish.jpg
index 659228b1e..f32739992 100644
--- a/res/drawable/wallpaper_jellyfish.jpg
+++ b/res/drawable/wallpaper_jellyfish.jpg
diff --git a/res/drawable/wallpaper_jellyfish_small.jpg b/res/drawable/wallpaper_jellyfish_small.jpg
index e140597c8..4e5d13464 100644
--- a/res/drawable/wallpaper_jellyfish_small.jpg
+++ b/res/drawable/wallpaper_jellyfish_small.jpg
diff --git a/res/drawable/wallpaper_lake.jpg b/res/drawable/wallpaper_lake.jpg
index 5ba522f57..874bb3b16 100644
--- a/res/drawable/wallpaper_lake.jpg
+++ b/res/drawable/wallpaper_lake.jpg
diff --git a/res/drawable/wallpaper_lake_small.jpg b/res/drawable/wallpaper_lake_small.jpg
index 179b26a05..36d56ccc7 100644
--- a/res/drawable/wallpaper_lake_small.jpg
+++ b/res/drawable/wallpaper_lake_small.jpg
diff --git a/res/drawable/wallpaper_mountain.jpg b/res/drawable/wallpaper_mountain.jpg
index 137617793..af4a3b1e4 100644
--- a/res/drawable/wallpaper_mountain.jpg
+++ b/res/drawable/wallpaper_mountain.jpg
diff --git a/res/drawable/wallpaper_mountain_small.jpg b/res/drawable/wallpaper_mountain_small.jpg
index 241647488..e2d5ac265 100644
--- a/res/drawable/wallpaper_mountain_small.jpg
+++ b/res/drawable/wallpaper_mountain_small.jpg
diff --git a/res/drawable/wallpaper_path.jpg b/res/drawable/wallpaper_path.jpg
index f4cb02ce0..c8d610e50 100644
--- a/res/drawable/wallpaper_path.jpg
+++ b/res/drawable/wallpaper_path.jpg
diff --git a/res/drawable/wallpaper_path_small.jpg b/res/drawable/wallpaper_path_small.jpg
index a1af4cdd8..f47d7a74f 100644
--- a/res/drawable/wallpaper_path_small.jpg
+++ b/res/drawable/wallpaper_path_small.jpg
diff --git a/res/drawable/wallpaper_pink.jpg b/res/drawable/wallpaper_pink.jpg
index 1b9f226e0..74403e552 100644
--- a/res/drawable/wallpaper_pink.jpg
+++ b/res/drawable/wallpaper_pink.jpg
diff --git a/res/drawable/wallpaper_pink_small.jpg b/res/drawable/wallpaper_pink_small.jpg
index 7b7ad587e..42b17709f 100644
--- a/res/drawable/wallpaper_pink_small.jpg
+++ b/res/drawable/wallpaper_pink_small.jpg
diff --git a/res/drawable/wallpaper_ripples.jpg b/res/drawable/wallpaper_ripples.jpg
index 8624c860f..4d740a41d 100644
--- a/res/drawable/wallpaper_ripples.jpg
+++ b/res/drawable/wallpaper_ripples.jpg
diff --git a/res/drawable/wallpaper_ripples_small.jpg b/res/drawable/wallpaper_ripples_small.jpg
index ce07d38af..c690d9c6a 100644
--- a/res/drawable/wallpaper_ripples_small.jpg
+++ b/res/drawable/wallpaper_ripples_small.jpg
diff --git a/res/drawable/wallpaper_road.jpg b/res/drawable/wallpaper_road.jpg
index 88611a4ec..3aaa63954 100644
--- a/res/drawable/wallpaper_road.jpg
+++ b/res/drawable/wallpaper_road.jpg
diff --git a/res/drawable/wallpaper_road_small.jpg b/res/drawable/wallpaper_road_small.jpg
index 0b0c390db..6bf401aaf 100644
--- a/res/drawable/wallpaper_road_small.jpg
+++ b/res/drawable/wallpaper_road_small.jpg
diff --git a/res/drawable/wallpaper_snow_leopard.jpg b/res/drawable/wallpaper_snow_leopard.jpg
index 0d33157a5..ffb5d0991 100644
--- a/res/drawable/wallpaper_snow_leopard.jpg
+++ b/res/drawable/wallpaper_snow_leopard.jpg
diff --git a/res/drawable/wallpaper_snow_leopard_small.jpg b/res/drawable/wallpaper_snow_leopard_small.jpg
index ec976aad9..99db5c693 100644
--- a/res/drawable/wallpaper_snow_leopard_small.jpg
+++ b/res/drawable/wallpaper_snow_leopard_small.jpg
diff --git a/res/drawable/wallpaper_sunrise.jpg b/res/drawable/wallpaper_sunrise.jpg
index 4ee8d5dde..e00f45ca7 100644
--- a/res/drawable/wallpaper_sunrise.jpg
+++ b/res/drawable/wallpaper_sunrise.jpg
diff --git a/res/drawable/wallpaper_sunrise_small.jpg b/res/drawable/wallpaper_sunrise_small.jpg
index aadd980ef..248b7e78f 100644
--- a/res/drawable/wallpaper_sunrise_small.jpg
+++ b/res/drawable/wallpaper_sunrise_small.jpg
diff --git a/res/drawable/wallpaper_sunset.jpg b/res/drawable/wallpaper_sunset.jpg
index bcfd8d4bd..bb2af6ed2 100644
--- a/res/drawable/wallpaper_sunset.jpg
+++ b/res/drawable/wallpaper_sunset.jpg
diff --git a/res/drawable/wallpaper_sunset_small.jpg b/res/drawable/wallpaper_sunset_small.jpg
index eff8f0da2..d5e5add39 100644
--- a/res/drawable/wallpaper_sunset_small.jpg
+++ b/res/drawable/wallpaper_sunset_small.jpg
diff --git a/res/drawable/wallpaper_zanzibar.jpg b/res/drawable/wallpaper_zanzibar.jpg
index fb133741e..75d175de1 100644
--- a/res/drawable/wallpaper_zanzibar.jpg
+++ b/res/drawable/wallpaper_zanzibar.jpg
diff --git a/res/drawable/wallpaper_zanzibar_small.jpg b/res/drawable/wallpaper_zanzibar_small.jpg
index 7307a7398..700a7fee1 100644
--- a/res/drawable/wallpaper_zanzibar_small.jpg
+++ b/res/drawable/wallpaper_zanzibar_small.jpg
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 11a81fd8e..e92c8dc18 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -16,7 +16,6 @@
 
 <com.android.launcher.DragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
     android:id="@+id/drag_layer"
@@ -37,15 +36,15 @@
 
     </com.android.launcher.Workspace>
 
-    <com.android.internal.widget.SlidingDrawer
+    <SlidingDrawer
         android:id="@+id/drawer"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
 
         android:orientation="horizontal"
-        androidprv:bottomOffset="7px"
-        androidprv:handle="@+id/all_apps"
-        androidprv:content="@+id/content">
+        android:bottomOffset="7dip"
+        android:handle="@+id/all_apps"
+        android:content="@+id/content">
         
         <com.android.launcher.HandleView
             android:id="@id/all_apps"
@@ -81,7 +80,7 @@
             android:verticalSpacing="10dip"
             android:numColumns="5" />
 
-    </com.android.internal.widget.SlidingDrawer>
+    </SlidingDrawer>
 
     <com.android.launcher.DeleteZone
         android:id="@+id/delete_zone"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 167331e86..1ba524b4d 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -16,7 +16,6 @@
 
 <com.android.launcher.DragLayer
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
     android:id="@+id/drag_layer"
@@ -37,15 +36,15 @@
 
     </com.android.launcher.Workspace>
 
-    <com.android.internal.widget.SlidingDrawer
+    <SlidingDrawer
         android:id="@+id/drawer"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
 
-        androidprv:topOffset="5px"
-        androidprv:bottomOffset="7px"
-        androidprv:handle="@+id/all_apps"
-        androidprv:content="@+id/content">
+        android:topOffset="5dip"
+        android:bottomOffset="7dip"
+        android:handle="@+id/all_apps"
+        android:content="@+id/content">
 
         <com.android.launcher.HandleView
             android:id="@id/all_apps"
@@ -81,7 +80,7 @@
             android:verticalSpacing="10dip"
             android:numColumns="4" />
 
-    </com.android.internal.widget.SlidingDrawer>
+    </SlidingDrawer>
 
     <com.android.launcher.DeleteZone
         android:id="@+id/delete_zone"
diff --git a/res/layout/add_list_item.xml b/res/layout/add_list_item.xml
new file mode 100644
index 000000000..f27651141
--- /dev/null
+++ b/res/layout/add_list_item.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:textAppearance="?android:attr/textAppearanceLargeInverse"
+    android:gravity="center_vertical"
+    android:drawablePadding="14dip"
+    android:paddingLeft="15dip"
+    android:paddingRight="15dip" />
diff --git a/res/layout/create_shortcut_list.xml b/res/layout/create_shortcut_list.xml
index 63ca2b879..aa1673375 100644
--- a/res/layout/create_shortcut_list.xml
+++ b/res/layout/create_shortcut_list.xml
@@ -17,11 +17,10 @@
 ** limitations under the License.
 */
 -->
-<ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android"
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:layout_marginTop="5px"
+    android:layout_marginTop="5dip"
     android:cacheColorHint="@null"
-    android:childDivider="@android:drawable/divider_horizontal_bright"
     android:divider="@android:drawable/divider_horizontal_bright"
     android:scrollbars="vertical" />
diff --git a/res/layout/gadget_error.xml b/res/layout/gadget_error.xml
new file mode 100644
index 000000000..bde07afd0
--- /dev/null
+++ b/res/layout/gadget_error.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="10dip"
+    android:paddingBottom="10dip"
+    android:paddingLeft="20dip"
+    android:paddingRight="20dip"
+    android:gravity="center"
+    android:background="@drawable/bg_gadget_error"
+    android:textAppearance="?android:attr/textAppearanceMediumInverse"
+    android:textColor="@color/gadget_error_color"
+    android:text="@string/gadget_error_text"
+    />
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index 27e591db9..dcc83a5bb 100644
--- a/res/layout/widget_search.xml
+++ b/res/layout/widget_search.xml
@@ -36,7 +36,7 @@
         android:singleLine="true"
         android:selectAllOnFocus="true"
         android:completionThreshold="1"
-        android:inputType="textAutoComplete|textSearchString"
+        android:inputType="textAutoComplete|textSearch"
         />
         
      <ImageButton android:id="@+id/search_go_btn"
@@ -46,4 +46,10 @@
          android:src="@*android:drawable/ic_btn_search"
          />
     
+     <ImageButton android:id="@+id/search_voice_btn"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:src="@android:drawable/ic_btn_speak_now"
+         />
+
 </com.android.launcher.Search>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c5afda2ad..d7d98e9ef 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Přidat na plochu"</string>
     <string name="group_applications">"Aplikace"</string>
     <string name="group_shortcuts">"Zástupce"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Složka Live"</string>
     <string name="group_widgets">"Miniaplikace"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Tapeta"</string>
     <string name="add_folder">"Složka"</string>
     <string name="add_clock">"Hodiny"</string>
     <string name="add_photo_frame">"Rámeček fotografie"</string>
     <string name="add_search">"Vyhledávání"</string>
     <string name="out_of_space">"Na této ploše již není místo."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Přidat"</string>
     <string name="menu_wallpaper">"Tapeta"</string>
     <string name="menu_search">"Hledat"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"zápis nastavení a odkazů plochy"</string>
     <string name="permdesc_write_settings">"Povoluje aplikaci změnit nastavení a odkazy plochy."</string>
     <string name="search_hint">"Vyhledávání Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3f0c42a61..f8c4b6119 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Zur Startseite hinzufügen"</string>
     <string name="group_applications">"Anwendung"</string>
     <string name="group_shortcuts">"Verknüpfung"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Live-Ordner"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Hintergrund"</string>
     <string name="add_folder">"Ordner"</string>
     <string name="add_clock">"Uhr"</string>
     <string name="add_photo_frame">"Bildrahmen"</string>
     <string name="add_search">"Suchen"</string>
     <string name="out_of_space">"Auf der Startseite ist kein Platz mehr vorhanden."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Hinzufügen"</string>
     <string name="menu_wallpaper">"Hintergrund"</string>
     <string name="menu_search">"Suchen"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"Einstellungen und Shortcuts für Startseite schreiben"</string>
     <string name="permdesc_write_settings">"Ermöglicht einer Anwendung, die Einstellungen und Shortcuts auf der Startseite zu ändern."</string>
     <string name="search_hint">"Google-Suche"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 161616dcf..96dbfa23d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Añadir a pantalla de página principal"</string>
     <string name="group_applications">"Aplicación"</string>
     <string name="group_shortcuts">"Acceso directo"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Carpeta activa"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Papel tapiz"</string>
     <string name="add_folder">"Carpeta"</string>
     <string name="add_clock">"Reloj"</string>
     <string name="add_photo_frame">"Picture frame"</string>
     <string name="add_search">"Búsqueda de Google"</string>
     <string name="out_of_space">"No queda espacio en esta pantalla de página principal."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Añadir"</string>
     <string name="menu_wallpaper">"Papel tapiz"</string>
     <string name="menu_search">"Búsqueda de Google"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"escribir información de accesos directos y de configuración de la página principal"</string>
     <string name="permdesc_write_settings">"Permite que una aplicación modifique la configuración y los accesos directos de la página principal."</string>
     <string name="search_hint">"Búsqueda de Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index effdc7aff..3d14a22a9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Ajouter à l\'écran d\'accueil"</string>
     <string name="group_applications">"Application"</string>
     <string name="group_shortcuts">"Raccourci"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Dossier live"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Arrière-plan"</string>
     <string name="add_folder">"Dossier"</string>
     <string name="add_clock">"Horloge"</string>
     <string name="add_photo_frame">"Cadre d\'image"</string>
     <string name="add_search">"Rechercher"</string>
     <string name="out_of_space">"Plus d\'espace libre sur l\'écran Accueil."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Ajouter"</string>
     <string name="menu_wallpaper">"Arrière-plan"</string>
     <string name="menu_search">"Rechercher"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"écrire les paramètres de la page d\'accueil et des raccourcis"</string>
     <string name="permdesc_write_settings">"Permet à une application de modifier les paramètres et les raccourcis de la page d\'accueil."</string>
     <string name="search_hint">"Recherche Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d38fa30c3..8c79d13c3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Aggiungi a schermata Home"</string>
     <string name="group_applications">"Applicazione"</string>
     <string name="group_shortcuts">"Collegamento"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Cartella dinamica"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Sfondo"</string>
     <string name="add_folder">"Cartella"</string>
     <string name="add_clock">"Orologio"</string>
     <string name="add_photo_frame">"Cornice immagini"</string>
     <string name="add_search">"Ricerca"</string>
     <string name="out_of_space">"Spazio nella schermata Home esaurito."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Aggiungi"</string>
     <string name="menu_wallpaper">"Sfondo"</string>
     <string name="menu_search">"Cerca"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"creare impostazioni e collegamenti in Home"</string>
     <string name="permdesc_write_settings">"Consente a un\'applicazione di modificare le impostazioni e i collegamenti in Home."</string>
     <string name="search_hint">"Ricerca Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c3b1ff8c4..0e7531408 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"ホーム画面に追加"</string>
     <string name="group_applications">"アプリケーション"</string>
     <string name="group_shortcuts">"ショートカット"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"ライブフォルダ"</string>
     <string name="group_widgets">"ウィジェット"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"壁紙"</string>
     <string name="add_folder">"フォルダ"</string>
     <string name="add_clock">"時計"</string>
     <string name="add_photo_frame">"写真フレーム"</string>
     <string name="add_search">"検索"</string>
     <string name="out_of_space">"このホーム画面には空きスペースがありません。"</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"追加"</string>
     <string name="menu_wallpaper">"壁紙"</string>
     <string name="menu_search">"検索"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"ホームの設定とショートカットの書き込み"</string>
     <string name="permdesc_write_settings">"ホームの設定とショートカットの変更をアプリケーションに許可します。"</string>
     <string name="search_hint">"Google検索"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
new file mode 100644
index 000000000..29cb53a24
--- /dev/null
+++ b/res/values-ko/strings.xml
@@ -0,0 +1,65 @@
+<?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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="application_name">"홈"</string>
+    <string name="folder_name">"폴더"</string>
+    <string name="chooser_wallpaper">"배경화면 선택"</string>
+    <string name="wallpaper_instructions">"배경화면 설정"</string>
+    <string name="pick_wallpaper">"배경화면 갤러리"</string>
+    <string name="activity_not_found">"전화기에 설치되어 있지 않은 응용프로그램입니다."</string>
+    <string name="rename_folder_label">"폴더 이름"</string>
+    <string name="rename_folder_title">"폴더 이름 바꾸기"</string>
+    <string name="rename_action">"확인"</string>
+    <string name="cancel_action">"취소"</string>
+    <string name="menu_item_add_item">"홈 화면에 추가"</string>
+    <string name="group_applications">"응용프로그램"</string>
+    <string name="group_shortcuts">"바로가기"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
+    <string name="group_live_folders">"라이브 폴더"</string>
+    <string name="group_widgets">"위젯"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
+    <string name="group_wallpapers">"배경화면"</string>
+    <string name="add_folder">"폴더"</string>
+    <string name="add_clock">"시계"</string>
+    <string name="add_photo_frame">"사진 프레임"</string>
+    <string name="add_search">"검색"</string>
+    <string name="out_of_space">"홈 화면에 더 이상 공간이 없습니다."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
+    <string name="menu_add">"추가"</string>
+    <string name="menu_wallpaper">"배경화면"</string>
+    <string name="menu_search">"검색"</string>
+    <string name="menu_notifications">"알림"</string>
+    <string name="menu_settings">"설정"</string>
+    <string name="permlab_install_shortcut">"바로가기 설치"</string>
+    <string name="permdesc_install_shortcut">"응용프로그램이 사용자의 작업 없이 바로가기를 추가할 수 있도록 합니다."</string>
+    <string name="permlab_uninstall_shortcut">"바로가기 제거"</string>
+    <string name="permdesc_uninstall_shortcut">"응용프로그램이 사용자의 작업 없이 바로가기를 제거할 수 있도록 합니다."</string>
+    <string name="permlab_read_settings">"홈 설정 및 바로가기 읽기"</string>
+    <string name="permdesc_read_settings">"응용프로그램이 홈에 있는 설정 및 바로가기를 읽을 수 있습니다."</string>
+    <string name="permlab_write_settings">"홈 설정 및 바로가기 쓰기"</string>
+    <string name="permdesc_write_settings">"응용프로그램이 홈에 있는 설정 및 바로가기를 변경할 수 있습니다."</string>
+    <string name="search_hint">"Google 검색"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
new file mode 100644
index 000000000..c485e6b17
--- /dev/null
+++ b/res/values-nb/strings.xml
@@ -0,0 +1,65 @@
+<?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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="application_name">"Hjem"</string>
+    <string name="folder_name">"Mappe"</string>
+    <string name="chooser_wallpaper">"Velg bakgrunnsbilde fra"</string>
+    <string name="wallpaper_instructions">"Velg bakgrunnsbilde"</string>
+    <string name="pick_wallpaper">"Bildegalleri"</string>
+    <string name="activity_not_found">"Applikasjonen er ikke installert."</string>
+    <string name="rename_folder_label">"Mappenavn"</string>
+    <string name="rename_folder_title">"Gi nytt navn til mappe"</string>
+    <string name="rename_action">"OK"</string>
+    <string name="cancel_action">"Avbryt"</string>
+    <string name="menu_item_add_item">"Legg til skrivebord"</string>
+    <string name="group_applications">"Applikasjon"</string>
+    <string name="group_shortcuts">"Snarvei"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
+    <string name="group_live_folders">"Aktiv mappe"</string>
+    <string name="group_widgets">"Skrivebordselement"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
+    <string name="group_wallpapers">"Bakgrunnsbilde"</string>
+    <string name="add_folder">"Mappe"</string>
+    <string name="add_clock">"Klokke"</string>
+    <string name="add_photo_frame">"Bilderamme"</string>
+    <string name="add_search">"Søk"</string>
+    <string name="out_of_space">"Ikke nok plass på skrivebordet."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
+    <string name="menu_add">"Legg til"</string>
+    <string name="menu_wallpaper">"Bakgrunnsbilde"</string>
+    <string name="menu_search">"Søk"</string>
+    <string name="menu_notifications">"Varslinger"</string>
+    <string name="menu_settings">"Innstillinger"</string>
+    <string name="permlab_install_shortcut">"shortcuts"</string>
+    <string name="permdesc_install_shortcut">"Allows an application to add shortcuts without user intervention."</string>
+    <string name="permlab_uninstall_shortcut">"uninstall shortcuts"</string>
+    <string name="permdesc_uninstall_shortcut">"Allows an application to remove shortcuts without user intervention."</string>
+    <string name="permlab_read_settings">"read Home settings and shortcuts"</string>
+    <string name="permdesc_read_settings">"Allows an application to read the settings and shortcuts in Home."</string>
+    <string name="permlab_write_settings">"write Home settings and shortcuts"</string>
+    <string name="permdesc_write_settings">"Allows an application to change the settings and shortcuts in Home."</string>
+    <string name="search_hint">"Google-søk"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9e55d8f44..bcb13ee41 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Toevoegen aan startpagina"</string>
     <string name="group_applications">"Toepassing"</string>
     <string name="group_shortcuts">"Snelkoppeling"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Live map"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Achtergrond"</string>
     <string name="add_folder">"Map"</string>
     <string name="add_clock">"Klok"</string>
     <string name="add_photo_frame">"Fotolijstje"</string>
     <string name="add_search">"Zoeken"</string>
     <string name="out_of_space">"Er is geen ruimte meer op dit startscherm."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Toevoegen"</string>
     <string name="menu_wallpaper">"Achtergrond"</string>
     <string name="menu_search">"Zoeken"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"instellingen en snelkoppelingen voor de startpagina schrijven"</string>
     <string name="permdesc_write_settings">"Hiermee kan een toepassing de instellingen en snelkoppelingen op de startpagina wijzigen."</string>
     <string name="search_hint">"Zoeken met Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 935695434..f5d4ca9d0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,7 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name">"Strona główna"</string>
+    <string name="application_name">"Sieć"</string>
     <string name="folder_name">"Folder"</string>
     <string name="chooser_wallpaper">"Wybierz tapetę"</string>
     <string name="wallpaper_instructions">"Ustaw tapetę"</string>
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Dodaj do strony głównej"</string>
     <string name="group_applications">"Aplikacja"</string>
     <string name="group_shortcuts">"Skrót"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Folder Live"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Tapeta"</string>
     <string name="add_folder">"Folder"</string>
     <string name="add_clock">"Zegar"</string>
     <string name="add_photo_frame">"Ramka obrazu"</string>
     <string name="add_search">"Szukaj"</string>
     <string name="out_of_space">"Brak miejsca na tej stronie głównej"</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Dodaj"</string>
     <string name="menu_wallpaper">"Tapeta"</string>
     <string name="menu_search">"Szukaj"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"zapisywanie ustawień i skrótów strony głównej"</string>
     <string name="permdesc_write_settings">"Umożliwia aplikacji zmianę ustawień i skrótów strony głównej."</string>
     <string name="search_hint">"Szukaj w Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9bb4787c1..d720e3b40 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"Добавление на главный экран"</string>
     <string name="group_applications">"Приложение"</string>
     <string name="group_shortcuts">"Ярлык"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"Динамическая папка"</string>
     <string name="group_widgets">"Виджет"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"Фоновый рисунок"</string>
     <string name="add_folder">"Папка"</string>
     <string name="add_clock">"Часы"</string>
     <string name="add_photo_frame">"Рамка для картинки"</string>
     <string name="add_search">"Поиск"</string>
     <string name="out_of_space">"На главном экране больше нет места."</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"Добавить"</string>
     <string name="menu_wallpaper">"Фоновый рисунок"</string>
     <string name="menu_search">"Искать"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"записывать ярлыки и настройки главного экрана"</string>
     <string name="permdesc_write_settings">"Позволяет приложению изменять настройки и ярлыки на главном экране."</string>
     <string name="search_hint">"Поиск Google"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 72ffcf42a..ec751399e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"添加到“主页”屏幕"</string>
     <string name="group_applications">"应用程序"</string>
     <string name="group_shortcuts">"快捷键"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"活动的文件夹"</string>
     <string name="group_widgets">"小工具"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"壁纸"</string>
     <string name="add_folder">"文件夹"</string>
     <string name="add_clock">"时钟"</string>
     <string name="add_photo_frame">"相框"</string>
     <string name="add_search">"搜索"</string>
     <string name="out_of_space">"该“主页”屏幕上没有多余空间。"</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"添加"</string>
     <string name="menu_wallpaper">"壁纸"</string>
     <string name="menu_search">"搜索"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"写入“主页”设置和快捷键"</string>
     <string name="permdesc_write_settings">"允许应用程序更改“主页”中的设置和快捷键。"</string>
     <string name="search_hint">"Google 搜索"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 35db6220c..aa4f951fa 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -28,14 +28,24 @@
     <string name="menu_item_add_item">"新增至首頁畫面"</string>
     <string name="group_applications">"應用程式"</string>
     <string name="group_shortcuts">"捷徑"</string>
+    <!-- no translation found for group_search (5905328940867162196) -->
+    <skip />
+    <!-- no translation found for group_folder (236213814675135523) -->
+    <skip />
     <string name="group_live_folders">"使用中的資料夾"</string>
     <string name="group_widgets">"Widget"</string>
+    <!-- no translation found for group_gadgets (7795333306847768497) -->
+    <skip />
     <string name="group_wallpapers">"桌布"</string>
     <string name="add_folder">"資料夾"</string>
     <string name="add_clock">"時鐘"</string>
     <string name="add_photo_frame">"相框"</string>
     <string name="add_search">"搜尋"</string>
     <string name="out_of_space">"首頁已無空間"</string>
+    <!-- no translation found for title_select_shortcut (2858897527672831763) -->
+    <skip />
+    <!-- no translation found for title_select_live_folder (441136484932944782) -->
+    <skip />
     <string name="menu_add">"新增"</string>
     <string name="menu_wallpaper">"桌布"</string>
     <string name="menu_search">"搜尋"</string>
@@ -50,4 +60,6 @@
     <string name="permlab_write_settings">"寫入首頁設定和捷徑"</string>
     <string name="permdesc_write_settings">"允許應用程式變更首頁中的設定和捷徑。"</string>
     <string name="search_hint">"Google 搜尋"</string>
+    <!-- no translation found for gadget_error_text (7654995305187314446) -->
+    <skip />
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d4051f0db..4a2aba375 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,4 +22,6 @@
     <color name="grid_dark_background">#EB191919</color>     
     <color name="bubble_dark_background">#B2191919</color>
     <color name="delete_color_filter">#A5FF0000</color>
+
+    <color name="gadget_error_color">#fccc</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1d3455ae..ff417987f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,9 +52,16 @@
     <string name="group_applications">Application</string>
     <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all shortcuts -->
     <string name="group_shortcuts">Shortcut</string>
+    <!-- Options in "Add to Home" dialog box; Title of the search gadget -->
+    <string name="group_search">Search</string>
+    <!-- Options in "Add to Home" dialog box; Title of the folder gadget -->
+    <string name="group_folder">Folder</string>
+    <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all live folders -->
     <string name="group_live_folders">Live folder</string>
     <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all widgets -->
     <string name="group_widgets">Widget</string>
+    <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all gadgets -->
+    <string name="group_gadgets">Gadget</string>
     <!-- Options in "Add to Home" dialog box; Title of the group containing the list of apps that can set the wallpaper-->
     <string name="group_wallpapers">Wallpaper</string>
     <!-- Options in "Add to Home" dialog box; Name of the Folder widget-->
@@ -68,6 +75,11 @@
     <!-- Error message when user has filled a home screen, possibly not used -->
     <string name="out_of_space">No more room on this Home screen.</string>
 
+    <!-- Title of dialog when user is selecting shortcut to add to homescreen -->
+    <string name="title_select_shortcut">Select shortcut</string>
+    <!-- Title of dialog when user is selecting live folder to add to homescreen -->
+    <string name="title_select_live_folder">Select live folder</string>
+
     <!-- Menus items: -->
     <skip />
     <!-- Verb, menu item used to add an item on the desktop -->
@@ -101,5 +113,8 @@
          This translation SHOULD MATCH the string "search_hint" which is found in 
          GoogleSearch/res/values/strings.xml -->
     <string name="search_hint">Google Search</string>
-        
+
+    <!-- Text to show user in place of a gadget when we can't display it properly -->
+    <string name="gadget_error_text">Problem loading gadget</string>
+
 </resources>