Code drop from //branches/cupcake/...@124589

17 files changed, 447 insertions, 52 deletions

diff --git a/res/drawable/google_logo.png b/res/drawable/google_logo.png
index 738abe013..54fd5f961 100644
--- a/res/drawable/google_logo.png
+++ b/res/drawable/google_logo.png
diff --git a/res/layout-land/application_boxed.xml b/res/layout-land/application_boxed.xml
index 3cec8d0be..63d2254b4 100644
--- a/res/layout-land/application_boxed.xml
+++ b/res/layout-land/application_boxed.xml
@@ -15,15 +15,17 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/name"
     android:layout_width="fill_parent"
     android:layout_height="88dip"
 
-    android:paddingTop="6dip"
-    android:paddingBottom="3dip"
+    android:paddingTop="5dip"
+    android:paddingBottom="2dip"
     android:drawablePadding="0dip"
 
     android:textSize="13dip"
     android:maxLines="2"
-    android:ellipsize="end"
+    android:ellipsize="marquee"
+    android:fadingEdge="horizontal"
     android:textColor="@color/bright_text_dark_focused"
     android:gravity="top|center_horizontal" />
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index e93ef31d2..11a81fd8e 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -16,6 +16,7 @@
 
 <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"
@@ -30,9 +31,9 @@
 
         launcher:defaultScreen="1">
 
-        <include layout="@layout/workspace_screen" />
-        <include layout="@layout/workspace_screen" />
-        <include layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
 
     </com.android.launcher.Workspace>
 
@@ -42,19 +43,24 @@
         android:layout_height="fill_parent"
 
         android:orientation="horizontal"
-        android:bottomOffset="7px"
-        android:handle="@+id/all_apps"
-        android:content="@+id/content">
-
-        <ImageView
+        androidprv:bottomOffset="7px"
+        androidprv:handle="@+id/all_apps"
+        androidprv:content="@+id/content">
+        
+        <com.android.launcher.HandleView
             android:id="@id/all_apps"
+            android:layout_width="56dip"
+            android:layout_height="fill_parent"
+
+            android:background="@drawable/handle"
+
             android:focusable="true"
             android:clickable="true"
+
             android:scaleType="center"
             android:src="@drawable/handle_icon"
-            android:background="@drawable/handle"
-            android:layout_height="fill_parent"
-            android:layout_width="56dip" />
+
+            launcher:direction="vertical" />
 
         <com.android.launcher.AllAppsGridView
             android:id="@id/content"
diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml
new file mode 100644
index 000000000..d1b02a4a6
--- /dev/null
+++ b/res/layout-land/live_folder_grid.xml
@@ -0,0 +1,49 @@
+<?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.
+ */
+-->
+
+<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical">
+    
+    <Button
+        android:id="@+id/close"
+    	android:background="@drawable/box_launcher_top"
+        android:gravity="left|center_vertical"
+        android:textSize="14sp"
+        android:textColor="#404040"
+        android:textStyle="bold"
+        android:layout_width="fill_parent"
+    	android:layout_height="wrap_content" />
+
+    <GridView
+        android:id="@id/content"
+        android:layout_width="fill_parent"
+    	android:layout_height="0dip"
+    	android:layout_weight="1"
+            
+        android:background="@drawable/box_launcher_bottom"
+
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+        android:scrollbarStyle="insideInset"
+        android:drawSelectorOnTop="false"
+        android:listSelector="@drawable/grid_selector"
+
+        android:verticalSpacing="10dip"
+        android:numColumns="5" />
+
+</com.android.launcher.LiveFolder>
diff --git a/res/layout-land/live_folder_icon.xml b/res/layout-land/live_folder_icon.xml
new file mode 100644
index 000000000..7b6d58dad
--- /dev/null
+++ b/res/layout-land/live_folder_icon.xml
@@ -0,0 +1,21 @@
+<?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.
+ */
+-->
+
+<com.android.launcher.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+ 	style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-port/application_boxed.xml b/res/layout-port/application_boxed.xml
index 3cec8d0be..63d2254b4 100644
--- a/res/layout-port/application_boxed.xml
+++ b/res/layout-port/application_boxed.xml
@@ -15,15 +15,17 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/name"
     android:layout_width="fill_parent"
     android:layout_height="88dip"
 
-    android:paddingTop="6dip"
-    android:paddingBottom="3dip"
+    android:paddingTop="5dip"
+    android:paddingBottom="2dip"
     android:drawablePadding="0dip"
 
     android:textSize="13dip"
     android:maxLines="2"
-    android:ellipsize="end"
+    android:ellipsize="marquee"
+    android:fadingEdge="horizontal"
     android:textColor="@color/bright_text_dark_focused"
     android:gravity="top|center_horizontal" />
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 41a1f5b0d..167331e86 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -16,6 +16,7 @@
 
 <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"
@@ -30,9 +31,9 @@
 
         launcher:defaultScreen="1">
 
-        <include layout="@layout/workspace_screen" />
-        <include layout="@layout/workspace_screen" />
-        <include layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell1" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell2" layout="@layout/workspace_screen" />
+        <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
 
     </com.android.launcher.Workspace>
 
@@ -41,20 +42,25 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
 
-        android:topOffset="5px"
-        android:bottomOffset="7px"
-        android:handle="@+id/all_apps"
-        android:content="@+id/content">
+        androidprv:topOffset="5px"
+        androidprv:bottomOffset="7px"
+        androidprv:handle="@+id/all_apps"
+        androidprv:content="@+id/content">
 
-        <ImageView
+        <com.android.launcher.HandleView
             android:id="@id/all_apps"
+            android:layout_width="fill_parent"
+            android:layout_height="56dip"
+
+            android:background="@drawable/handle"
+
             android:focusable="true"
             android:clickable="true"
+
             android:scaleType="center"
             android:src="@drawable/handle_icon"
-            android:background="@drawable/handle"
-            android:layout_width="fill_parent"
-            android:layout_height="56dip" />
+
+            launcher:direction="horizontal" />
 
         <com.android.launcher.AllAppsGridView
             android:id="@id/content"
diff --git a/res/layout-port/live_folder_grid.xml b/res/layout-port/live_folder_grid.xml
new file mode 100644
index 000000000..ec32d417c
--- /dev/null
+++ b/res/layout-port/live_folder_grid.xml
@@ -0,0 +1,49 @@
+<?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.
+ */
+-->
+
+<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical">
+        
+    <Button
+        android:id="@+id/close"
+   		android:background="@drawable/box_launcher_top"
+        android:gravity="left|center_vertical"
+        android:textSize="14sp"
+        android:textColor="#404040"
+        android:textStyle="bold"
+        android:layout_width="fill_parent"
+    	android:layout_height="wrap_content" />
+
+    <GridView
+        android:id="@id/content"
+        android:layout_width="fill_parent"
+    	android:layout_height="0dip"
+    	android:layout_weight="1"
+
+        android:background="@drawable/box_launcher_bottom"
+
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+        android:scrollbarStyle="insideInset"
+        android:drawSelectorOnTop="false"
+        android:listSelector="@drawable/grid_selector"
+
+        android:verticalSpacing="10dip"
+        android:numColumns="4" />
+
+</com.android.launcher.LiveFolder>
diff --git a/res/layout-port/live_folder_icon.xml b/res/layout-port/live_folder_icon.xml
new file mode 100644
index 000000000..dc711f3cf
--- /dev/null
+++ b/res/layout-port/live_folder_icon.xml
@@ -0,0 +1,21 @@
+<?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.
+ */
+-->
+
+<com.android.launcher.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+ 	style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout/application_list.xml b/res/layout/application_list.xml
new file mode 100644
index 000000000..230a95197
--- /dev/null
+++ b/res/layout/application_list.xml
@@ -0,0 +1,70 @@
+<?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.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+
+    android:paddingLeft="10dip"
+
+    android:orientation="horizontal">
+
+    <ImageView android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+
+        android:scaleType="center" />
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_weight="1.0"
+        android:layout_height="fill_parent"
+
+        android:paddingLeft="8dip"
+        android:paddingRight="8dip"
+
+        android:orientation="vertical"
+        android:gravity="center_vertical">
+
+        <TextView android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:singleLine="true"
+            android:ellipsize="end"
+
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        <TextView android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_below="@id/name"
+            android:layout_alignLeft="@id/name"
+
+            android:singleLine="true"
+            android:ellipsize="end"
+
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml
new file mode 100644
index 000000000..1d32f8878
--- /dev/null
+++ b/res/layout/live_folder_list.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.
+ */
+-->
+
+<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical">
+    
+    <Button
+        android:id="@+id/close"
+    	android:background="@drawable/box_launcher_top"
+        android:gravity="left|center_vertical"
+        android:textSize="14sp"
+        android:textColor="#404040"
+        android:textStyle="bold"
+        android:layout_width="fill_parent"
+    	android:layout_height="wrap_content" />
+
+    <ListView
+        android:id="@id/content"
+        android:layout_width="fill_parent"
+    	android:layout_height="0dip"
+    	android:layout_weight="1"
+
+        android:cacheColorHint="#00000000"
+        android:background="@drawable/box_launcher_bottom" />
+
+</com.android.launcher.LiveFolder>
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index 67ac34582..4343e2792 100644
--- a/res/layout/widget_search.xml
+++ b/res/layout/widget_search.xml
@@ -34,15 +34,15 @@
         android:hint="@string/search_hint"
         android:focusableInTouchMode="false"
         android:singleLine="true"
-        
+        android:selectAllOnFocus="true"
         android:completionThreshold="1"
         />
         
-    <Button
-         android:id="@+id/go"
-         android:layout_marginLeft="4dip"
+     <ImageButton android:id="@+id/search_go_btn"
+         android:layout_marginLeft="1dip"
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
-         android:text="@string/go"/>
-
+         android:src="@android:drawable/ic_btn_search"
+         />
+    
 </com.android.launcher.Search>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
new file mode 100644
index 000000000..7d3af0791
--- /dev/null
+++ b/res/values-de/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="application_name">"Startseite"</string>
+    <string name="folder_name">"Ordner"</string>
+    <string name="chooser_wallpaper">"Hintergrund auswählen"</string>
+    <string name="wallpaper_instructions">"Hintergrund festlegen"</string>
+    <string name="pick_wallpaper">"Galerie"</string>
+    <string name="activity_not_found">"Anwendung ist nicht auf dem Telefon installiert."</string>
+    <!-- no translation found for rename_folder_label (5646236631298452787) -->
+    <skip />
+    <string name="rename_folder_title">"Ordner umbenennen"</string>
+    <string name="rename_action">"OK"</string>
+    <string name="cancel_action">"Abbrechen"</string>
+    <!-- no translation found for menu_item_add_item (6233177331075781114) -->
+    <skip />
+    <string name="group_applications">"Anwendung"</string>
+    <string name="group_shortcuts">"Verknüpfung"</string>
+    <!-- no translation found for group_live_folders (3057578584715591220) -->
+    <skip />
+    <string name="group_widgets">"Widget"</string>
+    <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>
+    <string name="menu_add">"Hinzufügen"</string>
+    <string name="menu_wallpaper">"Hintergrund"</string>
+    <string name="menu_search">"Suchen"</string>
+    <string name="menu_notifications">"Benachrichtigungen"</string>
+    <string name="menu_settings">"Einstellungen"</string>
+    <string name="permlab_install_shortcut">"Verknüpfungen installieren"</string>
+    <string name="permdesc_install_shortcut">"Ermöglicht einer Anwendung das Hinzufügen von Verknüpfungen ohne Eingriff des Benutzers."</string>
+    <string name="permlab_uninstall_shortcut">"Verknüpfungen deinstallieren"</string>
+    <string name="permdesc_uninstall_shortcut">"Ermöglicht einer Anwendung das Entfernen von Verknüpfungen ohne Eingriff des Benutzers."</string>
+    <!-- no translation found for permlab_read_settings (3452408290738106747) -->
+    <skip />
+    <!-- no translation found for permdesc_read_settings (8377434937176025492) -->
+    <skip />
+    <!-- no translation found for permlab_write_settings (1360567537236705628) -->
+    <skip />
+    <!-- no translation found for permdesc_write_settings (1098648778383349818) -->
+    <skip />
+    <string name="search_hint">"Google-Suche"</string>
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
new file mode 100644
index 000000000..11d24bc38
--- /dev/null
+++ b/res/values-ja/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <!-- no translation found for rename_folder_label (5646236631298452787) -->
+    <skip />
+    <string name="rename_folder_title">"フォルダ名を変更"</string>
+    <string name="rename_action">"OK"</string>
+    <string name="cancel_action">"キャンセル"</string>
+    <!-- no translation found for menu_item_add_item (6233177331075781114) -->
+    <skip />
+    <string name="group_applications">"アプリケーション"</string>
+    <string name="group_shortcuts">"ショートカット"</string>
+    <!-- no translation found for group_live_folders (3057578584715591220) -->
+    <skip />
+    <string name="group_widgets">"ウィジェット"</string>
+    <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>
+    <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>
+    <!-- no translation found for permlab_read_settings (3452408290738106747) -->
+    <skip />
+    <!-- no translation found for permdesc_read_settings (8377434937176025492) -->
+    <skip />
+    <!-- no translation found for permlab_write_settings (1360567537236705628) -->
+    <skip />
+    <!-- no translation found for permdesc_write_settings (1098648778383349818) -->
+    <skip />
+    <string name="search_hint">"Google検索"</string>
+</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index caa243849..87f5b788b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,6 +17,16 @@
 -->
 
 <resources>
+    <!-- Orientation of a widget. -->
+    <attr name="direction">
+        <!-- Vertical widget. -->
+        <enum name="vertical" value="0" />
+        <!-- Horizontal widget. -->
+        <enum name="horizontal" value="1" />
+    </attr>
+
+    <skip />
+
     <!-- Workspace specific attributes. These attributes are used to customize
          the workspace in XML files. -->
     <declare-styleable name="Workspace">
@@ -49,12 +59,14 @@
          a DeleteZone view in XML files. -->
     <declare-styleable name="DeleteZone">
         <!-- Orientation of the delete zone. -->
-        <attr name="direction">
-            <!-- Vertical delete zone. -->
-            <enum name="vertical" value="0" />
-            <!-- Horizontal delete zone. This is the default value. -->
-            <enum name="horizontal" value="1" />
-        </attr>
+        <attr name="direction" />
+    </declare-styleable>
+
+    <!-- HandleView specific attributes. These attributes are used to customize
+         a HandleView view in XML files. -->
+    <declare-styleable name="HandleView">
+        <!-- Orientation of the handle. -->
+        <attr name="direction" />
     </declare-styleable>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2a997a1e..c1d3455ae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -19,52 +19,66 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- General -->
+    <skip />
     <!-- Application name -->
     <string name="application_name">Home</string>
     <!-- Default folder name -->
     <string name="folder_name">Folder</string>
-    <!-- Unused string -->
-    <string name="all_apps_folder_name">Applications</string>
-    <!-- Unused string -->
-    <string name="delete_name">Delete</string>
     <!-- Title of dialog that appears after user selects Wallpaper from menu -->
     <string name="chooser_wallpaper">Select wallpaper from</string>
     <!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
     <string name="wallpaper_instructions">Set wallpaper</string>
     <!-- Option in "Select wallpaper from" dialog box -->
     <string name="pick_wallpaper">Wallpaper gallery</string>
-    <!--Displayed when user selects a shortcut for an app that was uninstalled -->
+    <!-- Displayed when user selects a shortcut for an app that was uninstalled -->
     <string name="activity_not_found">Application is not installed on your phone.</string>
 
     <!-- Folders -->
+    <skip />
     <!-- Label of Folder name field in Rename folder dialog box -->
-    <string name="rename_folder_label">Folder name:</string>
+    <string name="rename_folder_label">Folder name</string>
     <!-- Title of dialog box -->
     <string name="rename_folder_title">Rename folder</string>
-    <!-- Buttons in Rename folder dialog box: -->
+    <!-- Buttons in Rename folder dialog box -->
     <string name="rename_action">OK</string>
+    <!-- Buttons in Rename folder dialog box -->
     <string name="cancel_action">Cancel</string>
 
     <!-- Shortcuts -->
+    <skip />
     <!-- Title of dialog box -->
-    <string name="menu_item_add_item">Add to Home</string>
-    <!-- Options in "Add to Home" dialog box: -->
+    <string name="menu_item_add_item">Add to Home screen</string>
+    <!-- Options in "Add to Home" dialog box; Title of the group containing the list of all apps -->
     <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>
+    <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 apps that can set the wallpaper-->
     <string name="group_wallpapers">Wallpaper</string>
+    <!-- Options in "Add to Home" dialog box; Name of the Folder widget-->
     <string name="add_folder">Folder</string>
+    <!-- Options in "Add to Home" dialog box; Name of the Clock widget-->
     <string name="add_clock">Clock</string>
+    <!-- Options in "Add to Home" dialog box; Name of the Picture frame widget-->
     <string name="add_photo_frame">Picture frame</string>
+    <!-- Options in "Add to Home" dialog box; Name of the Google Search widget-->
     <string name="add_search">Search</string>
     <!-- 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>
 
     <!-- Menus items: -->
+    <skip />
+    <!-- Verb, menu item used to add an item on the desktop -->
     <string name="menu_add">Add</string>
+    <!-- Noun, menu item used to set the desktop's wallpaper -->
     <string name="menu_wallpaper">Wallpaper</string>
+    <!-- Verb, menu item used to initiate a Google Search -->
     <string name="menu_search">Search</string>
+    <!-- Noun, menu item used to bring down the notifications shade -->
     <string name="menu_notifications">Notifications</string>
+    <!-- Noun, menu item used to show the system settings -->    
     <string name="menu_settings">Settings</string>
 
     <!-- Permissions: -->
@@ -74,9 +88,18 @@
     <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>
+
     <!-- Widgets: -->
-    <string name="go">Search</string>
+    <skip />    
+    <!-- This is the hint text shown in the search widget, before text is entered.
+         This translation SHOULD MATCH the string "search_hint" which is found in 
+         GoogleSearch/res/values/strings.xml -->
     <string name="search_hint">Google Search</string>
         
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a5aed0169..a3d3e22c7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -26,7 +26,7 @@
     <style name="WorkspaceIcon">
         <item name="android:textSize">13dip</item>
         <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
+        <item name="android:ellipsize">marquee</item>
         <item name="android:shadowColor">#FF000000</item>
         <item name="android:shadowRadius">2.0</item>
         <item name="android:textColor">#FFF</item>