Launcher2 compiles.
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 52a1a37..6de5658 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml
index ce4aade..c76a756 100644
--- a/res/layout-land/folder_icon.xml
+++ b/res/layout-land/folder_icon.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 8214863..3af51ec 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -14,16 +14,16 @@
limitations under the License.
-->
-<com.android.launcher.DragLayer
+<com.android.launcher2.DragLayer
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
android:id="@+id/drag_layer"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- The workspace contains 3 screens of cells -->
- <com.android.launcher.Workspace
+ <com.android.launcher2.Workspace
android:id="@+id/workspace"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -34,7 +34,7 @@
<include android:id="@+id/cell2" layout="@layout/workspace_screen" />
<include android:id="@+id/cell3" layout="@layout/workspace_screen" />
- </com.android.launcher.Workspace>
+ </com.android.launcher2.Workspace>
<SlidingDrawer
android:id="@+id/drawer"
@@ -46,7 +46,7 @@
android:handle="@+id/all_apps"
android:content="@+id/content">
- <com.android.launcher.HandleView
+ <com.android.launcher2.HandleView
android:id="@id/all_apps"
android:layout_width="56dip"
android:layout_height="fill_parent"
@@ -61,7 +61,7 @@
launcher:direction="vertical" />
- <com.android.launcher.AllAppsGridView
+ <com.android.launcher2.AllAppsGridView
android:id="@id/content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -82,7 +82,7 @@
</SlidingDrawer>
- <com.android.launcher.DeleteZone
+ <com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
android:layout_width="49dip"
android:layout_height="wrap_content"
@@ -97,4 +97,4 @@
launcher:direction="vertical" />
-</com.android.launcher.DragLayer>
+</com.android.launcher2.DragLayer>
diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml
index bb623b0..8905cf3 100644
--- a/res/layout-land/live_folder_grid.xml
+++ b/res/layout-land/live_folder_grid.xml
@@ -17,7 +17,7 @@
*/
-->
-<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
<Button
@@ -47,4 +47,4 @@
android:verticalSpacing="10dip"
android:numColumns="5" />
-</com.android.launcher.LiveFolder>
+</com.android.launcher2.LiveFolder>
diff --git a/res/layout-land/live_folder_icon.xml b/res/layout-land/live_folder_icon.xml
index 7b6d58d..64c2d44 100644
--- a/res/layout-land/live_folder_icon.xml
+++ b/res/layout-land/live_folder_icon.xml
@@ -17,5 +17,5 @@
*/
-->
-<com.android.launcher.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Landscape" />
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
index fbf337b..b27c94b 100644
--- a/res/layout-land/user_folder.xml
+++ b/res/layout-land/user_folder.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher.UserFolder xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.UserFolder xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
<Button
@@ -44,4 +44,4 @@
android:verticalSpacing="10dip"
android:numColumns="5" />
-</com.android.launcher.UserFolder>
+</com.android.launcher2.UserFolder>
diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml
index 62e59b9..5207d7b 100644
--- a/res/layout-land/workspace_screen.xml
+++ b/res/layout-land/workspace_screen.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher.CellLayout
+<com.android.launcher2.CellLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index b984258..f904a66 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
index 1d50370..49049cf 100644
--- a/res/layout-port/folder_icon.xml
+++ b/res/layout-port/folder_icon.xml
@@ -14,5 +14,5 @@
limitations under the License.
-->
-<com.android.launcher.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 7dcacd6..6ed605b 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -14,16 +14,16 @@
limitations under the License.
-->
-<com.android.launcher.DragLayer
+<com.android.launcher2.DragLayer
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
android:id="@+id/drag_layer"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- The workspace contains 3 screens of cells -->
- <com.android.launcher.Workspace
+ <com.android.launcher2.Workspace
android:id="@+id/workspace"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -34,7 +34,7 @@
<include android:id="@+id/cell2" layout="@layout/workspace_screen" />
<include android:id="@+id/cell3" layout="@layout/workspace_screen" />
- </com.android.launcher.Workspace>
+ </com.android.launcher2.Workspace>
<SlidingDrawer
android:id="@+id/drawer"
@@ -46,7 +46,7 @@
android:handle="@+id/all_apps"
android:content="@+id/content">
- <com.android.launcher.HandleView
+ <com.android.launcher2.HandleView
android:id="@id/all_apps"
android:layout_width="fill_parent"
android:layout_height="56dip"
@@ -61,7 +61,7 @@
launcher:direction="horizontal" />
- <com.android.launcher.AllAppsGridView
+ <com.android.launcher2.AllAppsGridView
android:id="@id/content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
@@ -82,7 +82,7 @@
</SlidingDrawer>
- <com.android.launcher.DeleteZone
+ <com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
android:layout_width="wrap_content"
android:layout_height="49dip"
@@ -96,4 +96,4 @@
launcher:direction="horizontal" />
-</com.android.launcher.DragLayer>
+</com.android.launcher2.DragLayer>
diff --git a/res/layout-port/live_folder_grid.xml b/res/layout-port/live_folder_grid.xml
index e5bcafe..1f82216 100644
--- a/res/layout-port/live_folder_grid.xml
+++ b/res/layout-port/live_folder_grid.xml
@@ -17,7 +17,7 @@
*/
-->
-<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
<Button
@@ -47,4 +47,4 @@
android:verticalSpacing="10dip"
android:numColumns="4" />
-</com.android.launcher.LiveFolder>
+</com.android.launcher2.LiveFolder>
diff --git a/res/layout-port/live_folder_icon.xml b/res/layout-port/live_folder_icon.xml
index dc711f3..e3cd49e 100644
--- a/res/layout-port/live_folder_icon.xml
+++ b/res/layout-port/live_folder_icon.xml
@@ -17,5 +17,5 @@
*/
-->
-<com.android.launcher.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/WorkspaceIcon.Portrait" />
diff --git a/res/layout-port/user_folder.xml b/res/layout-port/user_folder.xml
index 27d70fc..3d0dfb7 100644
--- a/res/layout-port/user_folder.xml
+++ b/res/layout-port/user_folder.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<com.android.launcher.UserFolder xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.UserFolder xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
<Button
@@ -44,4 +44,4 @@
android:verticalSpacing="10dip"
android:numColumns="4" />
-</com.android.launcher.UserFolder>
+</com.android.launcher2.UserFolder>
diff --git a/res/layout-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml
index c6d419b..6bbf6e9 100644
--- a/res/layout-port/workspace_screen.xml
+++ b/res/layout-port/workspace_screen.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher.CellLayout
+<com.android.launcher2.CellLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
diff --git a/res/layout/application_list.xml b/res/layout/application_list.xml
index 230a951..39639ba 100644
--- a/res/layout/application_list.xml
+++ b/res/layout/application_list.xml
@@ -67,4 +67,4 @@
</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml
index f96a190..00f191e 100644
--- a/res/layout/live_folder_list.xml
+++ b/res/layout/live_folder_list.xml
@@ -17,7 +17,7 @@
*/
-->
-<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher2.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical">
<Button
@@ -39,4 +39,4 @@
android:cacheColorHint="#ff333333"
android:background="@drawable/box_launcher_bottom" />
-</com.android.launcher.LiveFolder>
+</com.android.launcher2.LiveFolder>
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index a83e675..3aee913 100644
--- a/res/layout/widget_search.xml
+++ b/res/layout/widget_search.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
-<com.android.launcher.Search
+<com.android.launcher2.Search
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"
android:id="@+id/widget_search"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -58,4 +58,4 @@
</LinearLayout>
-</com.android.launcher.Search>
+</com.android.launcher2.Search>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2796171..f971f7c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@
<!-- General -->
<skip />
<!-- Application name -->
- <string name="application_name">Home</string>
+ <string name="application_name">Launcher2</string>
<!-- Name for all applications running as this uid. -->
<string name="uid_name">Android Core Apps</string>
<!-- Default folder name -->
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 60bfe82..da983d0 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2">
<search
launcher:screen="1"