Launcher2 compiles.

60 files changed, 94 insertions, 93 deletions

diff --git a/Android.mk b/Android.mk
index b95e3d811..73ef0352a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,13 +17,13 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := user
+#LOCAL_MODULE_TAGS := user
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_PACKAGE_NAME := Launcher
+LOCAL_PACKAGE_NAME := Launcher2
 LOCAL_CERTIFICATE := shared
 
-LOCAL_OVERRIDES_PACKAGES := Home
+#LOCAL_OVERRIDES_PACKAGES := Home
 
 include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e60e665c..c0d03bc7f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,10 +19,11 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher"
+    package="com.android.launcher2"
     android:sharedUserId="android.uid.shared"
     android:sharedUserLabel="@string/uid_name">
 
+    <!-- Turned off until there is only one launcher
     <permission
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
@@ -47,6 +48,7 @@
         android:protectionLevel="normal"
         android:label="@string/permlab_write_settings"
         android:description="@string/permdesc_write_settings"/>
+    -->
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
@@ -76,9 +78,8 @@
             android:windowSoftInputMode="stateUnspecified|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.HOME"/>
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.MONKEY" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
@@ -118,7 +119,7 @@
         <!-- The settings provider contains Home's data, like the workspace favorites -->
         <provider
             android:name="LauncherProvider"
-            android:authorities="com.android.launcher.settings"
+            android:authorities="com.android.launcher2.settings"
             android:writePermission="com.android.launcher.permission.WRITE_SETTINGS"
             android:readPermission="com.android.launcher.permission.READ_SETTINGS" />
 
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 52a1a37ea..6de565878 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 ce4aade8b..c76a75666 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 8214863f7..3af51ec55 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 bb623b0f6..8905cf330 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 7b6d58dad..64c2d444c 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 fbf337bdd..b27c94b08 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 62e59b9ab..5207d7b9c 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 b984258d2..f904a661f 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 1d5037094..49049cfaf 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 7dcacd6dd..6ed605b00 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 e5bcafe54..1f82216ff 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 dc711f3cf..e3cd49e34 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 27d70fc7a..3d0dfb7fc 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 c6d419b95..6bbf6e951 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 230a95197..39639ba86 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 f96a19094..00f191e3f 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 a83e675ee..3aee913e9 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 2796171b5..f971f7cae 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 60bfe8294..da983d006 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"
diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/android/launcher2/AddAdapter.java
index a6c889e13..0c63fa5d6 100644
--- a/src/com/android/launcher2/AddAdapter.java
+++ b/src/com/android/launcher2/AddAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/AllAppsGridView.java b/src/com/android/launcher2/AllAppsGridView.java
index b8f79025f..7e1b54e2f 100644
--- a/src/com/android/launcher2/AllAppsGridView.java
+++ b/src/com/android/launcher2/AllAppsGridView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.widget.GridView;
 import android.widget.AdapterView;
diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher2/ApplicationInfo.java
index cee9f3bfc..912f04edc 100644
--- a/src/com/android/launcher2/ApplicationInfo.java
+++ b/src/com/android/launcher2/ApplicationInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.ComponentName;
 import android.content.ContentValues;
diff --git a/src/com/android/launcher2/ApplicationsAdapter.java b/src/com/android/launcher2/ApplicationsAdapter.java
index 97891b2e7..98f7c63e9 100644
--- a/src/com/android/launcher2/ApplicationsAdapter.java
+++ b/src/com/android/launcher2/ApplicationsAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher2/BubbleTextView.java
index 37824545e..c357cb20d 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher2/BubbleTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.widget.TextView;
 import android.content.Context;
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 73dbb3ed2..2f094034d 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/src/com/android/launcher2/DeleteZone.java b/src/com/android/launcher2/DeleteZone.java
index 02e8011d0..f7266256e 100644
--- a/src/com/android/launcher2/DeleteZone.java
+++ b/src/com/android/launcher2/DeleteZone.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.widget.ImageView;
 import android.content.Context;
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 29cf15a5c..f8c80775d 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.view.View;
 
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 070c93841..3439de091 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/src/com/android/launcher2/DragScroller.java b/src/com/android/launcher2/DragScroller.java
index 2c18a79a4..c3c251c2f 100644
--- a/src/com/android/launcher2/DragScroller.java
+++ b/src/com/android/launcher2/DragScroller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 /**
  * Handles scrolling while dragging
diff --git a/src/com/android/launcher2/DragSource.java b/src/com/android/launcher2/DragSource.java
index 0ac25bbd1..3c0a09d32 100644
--- a/src/com/android/launcher2/DragSource.java
+++ b/src/com/android/launcher2/DragSource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.view.View;
 
diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/android/launcher2/DropTarget.java
index 4835323d8..e092e5095 100644
--- a/src/com/android/launcher2/DropTarget.java
+++ b/src/com/android/launcher2/DropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.graphics.Rect;
 
diff --git a/src/com/android/launcher2/FastBitmapDrawable.java b/src/com/android/launcher2/FastBitmapDrawable.java
index 170f1adc3..db2c01c4f 100644
--- a/src/com/android/launcher2/FastBitmapDrawable.java
+++ b/src/com/android/launcher2/FastBitmapDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.graphics.drawable.Drawable;
 import android.graphics.PixelFormat;
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index fb4e8d6c5..6281ebf98 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index a56101d51..1531538fb 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/FolderInfo.java b/src/com/android/launcher2/FolderInfo.java
index a58675b0b..8732690c3 100644
--- a/src/com/android/launcher2/FolderInfo.java
+++ b/src/com/android/launcher2/FolderInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 
 /**
diff --git a/src/com/android/launcher2/HandleView.java b/src/com/android/launcher2/HandleView.java
index 9afe41cac..5af5c8172 100644
--- a/src/com/android/launcher2/HandleView.java
+++ b/src/com/android/launcher2/HandleView.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.widget.ImageView;
 import android.content.Context;
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher2/InstallShortcutReceiver.java
index 7c727a86f..45ff24e17 100644
--- a/src/com/android/launcher2/InstallShortcutReceiver.java
+++ b/src/com/android/launcher2/InstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher2/ItemInfo.java
index 71cee1878..b371163c3 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/android/launcher2/ItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index f1af0b135..db6e93976 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -1658,7 +1658,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On
         if (folderInfo instanceof UserFolderInfo) {
             openFolder = UserFolder.fromXml(this);
         } else if (folderInfo instanceof LiveFolderInfo) {
-            openFolder = com.android.launcher.LiveFolder.fromXml(this, folderInfo);
+            openFolder = com.android.launcher2.LiveFolder.fromXml(this, folderInfo);
         } else {
             return;
         }
diff --git a/src/com/android/launcher2/LauncherAppWidgetHost.java b/src/com/android/launcher2/LauncherAppWidgetHost.java
index 22fd5b6f3..a5761ecc3 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher2/LauncherAppWidgetHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetHostView;
diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher2/LauncherAppWidgetHostView.java
index da5b3a02d..d8fe49918 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher2/LauncherAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
diff --git a/src/com/android/launcher2/LauncherAppWidgetInfo.java b/src/com/android/launcher2/LauncherAppWidgetInfo.java
index 3b5f08edf..cd4643461 100644
--- a/src/com/android/launcher2/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher2/LauncherAppWidgetInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.ContentValues;
diff --git a/src/com/android/launcher2/LauncherApplication.java b/src/com/android/launcher2/LauncherApplication.java
index d71fa19a1..03fe5626d 100644
--- a/src/com/android/launcher2/LauncherApplication.java
+++ b/src/com/android/launcher2/LauncherApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.app.Application;
 import dalvik.system.VMRuntime;
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 591463bd0..7676b846a 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.ComponentName;
 import android.content.ContentResolver;
diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java
index fc38cdd7f..dff72a29f 100644
--- a/src/com/android/launcher2/LauncherProvider.java
+++ b/src/com/android/launcher2/LauncherProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.appwidget.AppWidgetHost;
 import android.content.ContentProvider;
@@ -47,7 +47,7 @@ import java.util.ArrayList;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParser;
 import com.android.internal.util.XmlUtils;
-import com.android.launcher.LauncherSettings.Favorites;
+import com.android.launcher2.LauncherSettings.Favorites;
 
 public class LauncherProvider extends ContentProvider {
     private static final String LOG_TAG = "LauncherProvider";
@@ -57,10 +57,10 @@ public class LauncherProvider extends ContentProvider {
     
     private static final int DATABASE_VERSION = 4;
 
-    static final String AUTHORITY = "com.android.launcher.settings";
+    static final String AUTHORITY = "com.android.launcher2.settings";
     
-    static final String EXTRA_BIND_SOURCES = "com.android.launcher.settings.bindsources";
-    static final String EXTRA_BIND_TARGETS = "com.android.launcher.settings.bindtargets";
+    static final String EXTRA_BIND_SOURCES = "com.android.launcher2.settings.bindsources";
+    static final String EXTRA_BIND_TARGETS = "com.android.launcher2.settings.bindtargets";
 
     static final String TABLE_FAVORITES = "favorites";
     static final String TABLE_GESTURES = "gestures";
diff --git a/src/com/android/launcher2/LauncherSettings.java b/src/com/android/launcher2/LauncherSettings.java
index 8cc2559f7..a930acd52 100644
--- a/src/com/android/launcher2/LauncherSettings.java
+++ b/src/com/android/launcher2/LauncherSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.provider.BaseColumns;
 import android.net.Uri;
diff --git a/src/com/android/launcher2/LiveFolder.java b/src/com/android/launcher2/LiveFolder.java
index 44a283e09..ecd9bdf9c 100644
--- a/src/com/android/launcher2/LiveFolder.java
+++ b/src/com/android/launcher2/LiveFolder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/android/launcher2/LiveFolderAdapter.java b/src/com/android/launcher2/LiveFolderAdapter.java
index c40504167..b0e9eff1f 100644
--- a/src/com/android/launcher2/LiveFolderAdapter.java
+++ b/src/com/android/launcher2/LiveFolderAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.widget.CursorAdapter;
 import android.widget.TextView;
diff --git a/src/com/android/launcher2/LiveFolderIcon.java b/src/com/android/launcher2/LiveFolderIcon.java
index 14a4ee664..4e1904102 100644
--- a/src/com/android/launcher2/LiveFolderIcon.java
+++ b/src/com/android/launcher2/LiveFolderIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/LiveFolderInfo.java b/src/com/android/launcher2/LiveFolderInfo.java
index ec865a445..5b1217c15 100644
--- a/src/com/android/launcher2/LiveFolderInfo.java
+++ b/src/com/android/launcher2/LiveFolderInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.ContentValues;
 import android.content.Intent;
diff --git a/src/com/android/launcher2/Search.java b/src/com/android/launcher2/Search.java
index 8a7c3529c..203754ec8 100644
--- a/src/com/android/launcher2/Search.java
+++ b/src/com/android/launcher2/Search.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.app.SearchManager;
 import android.content.ActivityNotFoundException;
diff --git a/src/com/android/launcher2/UninstallShortcutReceiver.java b/src/com/android/launcher2/UninstallShortcutReceiver.java
index 9fd6298bd..e65c6a039 100644
--- a/src/com/android/launcher2/UninstallShortcutReceiver.java
+++ b/src/com/android/launcher2/UninstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/launcher2/UserFolder.java b/src/com/android/launcher2/UserFolder.java
index 6cdfed950..a5e90587e 100644
--- a/src/com/android/launcher2/UserFolder.java
+++ b/src/com/android/launcher2/UserFolder.java
@@ -1,4 +1,4 @@
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/android/launcher2/UserFolderInfo.java b/src/com/android/launcher2/UserFolderInfo.java
index 639894e59..40ec9e183 100644
--- a/src/com/android/launcher2/UserFolderInfo.java
+++ b/src/com/android/launcher2/UserFolderInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.ContentValues;
 
diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher2/Utilities.java
index 4a22cba40..dc61be366 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher2/Utilities.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
diff --git a/src/com/android/launcher2/WallpaperChooser.java b/src/com/android/launcher2/WallpaperChooser.java
index 70396d040..02e85eef5 100644
--- a/src/com/android/launcher2/WallpaperChooser.java
+++ b/src/com/android/launcher2/WallpaperChooser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.app.Activity;
 import android.app.IWallpaperService;
diff --git a/src/com/android/launcher2/Widget.java b/src/com/android/launcher2/Widget.java
index 4f246cc77..348acee7c 100644
--- a/src/com/android/launcher2/Widget.java
+++ b/src/com/android/launcher2/Widget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.ContentValues;
 import android.graphics.Bitmap;
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index f5dc63341..df3f25b7e 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher;
+package com.android.launcher2;
 
 import android.content.Context;
 import android.content.Intent;