diff --git a/Android.mk b/Android.mk
index 351954130e..a2e2f107a1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 The Android Open Source Project
+# Copyright (C) 2013 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.
@@ -22,10 +22,10 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 17
 
-LOCAL_PACKAGE_NAME := Launcher2
-LOCAL_CERTIFICATE := shared
+LOCAL_PACKAGE_NAME := Launcher3
+#LOCAL_CERTIFICATE := shared
 
 LOCAL_OVERRIDES_PACKAGES := Home
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f3ef6c8c15..81d7c8b620 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,34 +19,32 @@
 -->
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher">
-
-    <original-package android:name="com.android.launcher2" />
+    package="com.android.launcher3">
 
     <permission
-        android:name="com.android.launcher.permission.PRELOAD_WORKSPACE"
+        android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="system|signature" />
     <permission
-        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
+        android:name="com.android.launcher3.permission.INSTALL_SHORTCUT"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="dangerous"
         android:label="@string/permlab_install_shortcut"
         android:description="@string/permdesc_install_shortcut" />
     <permission
-        android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
+        android:name="com.android.launcher3.permission.UNINSTALL_SHORTCUT"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="dangerous"
         android:label="@string/permlab_uninstall_shortcut"
         android:description="@string/permdesc_uninstall_shortcut"/>
     <permission
-        android:name="com.android.launcher.permission.READ_SETTINGS"
+        android:name="com.android.launcher3.permission.READ_SETTINGS"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="normal"
         android:label="@string/permlab_read_settings"
         android:description="@string/permdesc_read_settings"/>
     <permission
-        android:name="com.android.launcher.permission.WRITE_SETTINGS"
+        android:name="com.android.launcher3.permission.WRITE_SETTINGS"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="normal"
         android:label="@string/permlab_write_settings"
@@ -58,18 +56,18 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BIND_APPWIDGET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
-    <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
+    <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
 
     <application
-        android:name="com.android.launcher2.LauncherApplication"
+        android:name="com.android.launcher3.LauncherApplication"
         android:label="@string/application_name"
         android:icon="@mipmap/ic_launcher_home"
         android:hardwareAccelerated="true"
         android:largeHeap="@bool/config_largeHeap"
         android:supportsRtl="true">
         <activity
-            android:name="com.android.launcher2.Launcher"
+            android:name="com.android.launcher3.Launcher"
             android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
             android:stateNotNeeded="true"
@@ -85,7 +83,7 @@
         </activity>
 
         <activity
-            android:name="com.android.launcher2.WallpaperChooser"
+            android:name="com.android.launcher3.WallpaperChooser"
             android:theme="@style/Theme.WallpaperPicker"
             android:label="@string/pick_wallpaper"
             android:icon="@mipmap/ic_launcher_wallpaper"
@@ -101,41 +99,41 @@
 
         <!-- Intent received used to prepopulate the default workspace. -->
         <receiver
-            android:name="com.android.launcher2.PreloadReceiver"
-            android:permission="com.android.launcher.permission.PRELOAD_WORKSPACE">
+            android:name="com.android.launcher3.PreloadReceiver"
+            android:permission="com.android.launcher3.permission.PRELOAD_WORKSPACE">
             <intent-filter>
-                <action android:name="com.android.launcher.action.PRELOAD_WORKSPACE" />
+                <action android:name="com.android.launcher3.action.PRELOAD_WORKSPACE" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received used to install shortcuts from other applications -->
         <receiver
-            android:name="com.android.launcher2.InstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.INSTALL_SHORTCUT">
+            android:name="com.android.launcher3.InstallShortcutReceiver"
+            android:permission="com.android.launcher3.permission.INSTALL_SHORTCUT">
             <intent-filter>
-                <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
+                <action android:name="com.android.launcher3.action.INSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
         <!-- Intent received used to uninstall shortcuts from other applications -->
         <receiver
-            android:name="com.android.launcher2.UninstallShortcutReceiver"
-            android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT">
+            android:name="com.android.launcher3.UninstallShortcutReceiver"
+            android:permission="com.android.launcher3.permission.UNINSTALL_SHORTCUT">
             <intent-filter>
-                <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
+                <action android:name="com.android.launcher3.action.UNINSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
         <!-- New user initialization; set up initial wallpaper -->
         <receiver
-            android:name="com.android.launcher2.UserInitializeReceiver"
+            android:name="com.android.launcher3.UserInitializeReceiver"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.android.launcher2.PackageChangedReceiver" >
+        <receiver android:name="com.android.launcher3.PackageChangedReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_CHANGED"/>
                 <action android:name="android.intent.action.PACKAGE_REPLACED"/>
@@ -146,11 +144,11 @@
 
         <!-- The settings provider contains Home's data, like the workspace favorites -->
         <provider
-            android:name="com.android.launcher2.LauncherProvider"
-            android:authorities="com.android.launcher2.settings"
+            android:name="com.android.launcher3.LauncherProvider"
+            android:authorities="com.android.launcher3.settings"
             android:exported="true"
-            android:writePermission="com.android.launcher.permission.WRITE_SETTINGS"
-            android:readPermission="com.android.launcher.permission.READ_SETTINGS" />
+            android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS"
+            android:readPermission="com.android.launcher3.permission.READ_SETTINGS" />
 
         <meta-data android:name="android.nfc.disable_beam_default"
                        android:value="true" />
diff --git a/proguard.flags b/proguard.flags
index 0cde28ec17..ada6226957 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,4 +1,4 @@
--keep class com.android.launcher2.Launcher {
+-keep class com.android.launcher3.Launcher {
   public void previousScreen(android.view.View);
   public void nextScreen(android.view.View);
   public void launchHotSeat(android.view.View);
@@ -11,7 +11,7 @@
   public void dismissAllAppsCling(android.view.View);
 }
 
--keep class com.android.launcher2.CellLayout {
+-keep class com.android.launcher3.CellLayout {
   public float getBackgroundAlpha();
   public void setBackgroundAlpha(float);
   public float getDimmableProgress();
@@ -22,7 +22,7 @@
   public void setHoverAlpha(float);
 }
 
--keep class com.android.launcher2.DragLayer$LayoutParams {
+-keep class com.android.launcher3.DragLayer$LayoutParams {
   public void setWidth(int);
   public int getWidth();
   public void setHeight(int);
@@ -33,7 +33,7 @@
   public int getY();
 }
 
--keep class com.android.launcher2.CellLayout$LayoutParams {
+-keep class com.android.launcher3.CellLayout$LayoutParams {
   public void setWidth(int);
   public int getWidth();
   public void setHeight(int);
@@ -44,7 +44,7 @@
   public int getY();
 }
 
--keep class com.android.launcher2.Workspace {
+-keep class com.android.launcher3.Workspace {
   public float getBackgroundAlpha();
   public void setBackgroundAlpha(float);
   public float getChildrenOutlineAlpha();
@@ -55,10 +55,10 @@
   public float getHorizontalWallpaperOffset();
 }
 
--keep class com.android.launcher2.AllApps3D$Defines {
+-keep class com.android.launcher3.AllApps3D$Defines {
   *;
 }
 
--keep class com.android.launcher2.ClippedImageView {
+-keep class com.android.launcher3.ClippedImageView {
   *;
 }
diff --git a/res/drawable/wallpaper_gallery_background.xml b/res/drawable/wallpaper_gallery_background.xml
index 271c1dfb8c..283b4684ce 100644
--- a/res/drawable/wallpaper_gallery_background.xml
+++ b/res/drawable/wallpaper_gallery_background.xml
@@ -17,4 +17,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient android:startColor="#0000" android:endColor="#D0000000"
             android:angle="270"/>
-</shape>
\ No newline at end of file
+</shape>
diff --git a/res/layout-land/all_apps_cling.xml b/res/layout-land/all_apps_cling.xml
index fccf400af4..820f00a6d2 100644
--- a/res/layout-land/all_apps_cling.xml
+++ b/res/layout-land/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="all_apps_landscape">
     <FrameLayout
         android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml
index 9ed1fa1155..d20e1be1e7 100644
--- a/res/layout-land/application.xml
+++ b/res/layout-land/application.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Landscape"
    android:focusable="true"
    android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-land/apps_customize_application.xml b/res/layout-land/apps_customize_application.xml
index ba95b27a65..bf0022d763 100644
--- a/res/layout-land/apps_customize_application.xml
+++ b/res/layout-land/apps_customize_application.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.PagedViewIcon
+<com.android.launcher3.PagedViewIcon
     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-auto/com.android.launcher3"
 
     style="@style/WorkspaceIcon.Landscape.AppsCustomize"
 
diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml
index b39fbb1b55..275edeeadc 100644
--- a/res/layout-land/folder_cling.xml
+++ b/res/layout-land/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="folder_landscape">
     <FrameLayout
         android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml
index 808ff5e7b1..32d729802a 100644
--- a/res/layout-land/folder_icon.xml
+++ b/res/layout-land/folder_icon.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.FolderIcon
+<com.android.launcher3.FolderIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +27,7 @@
         android:layout_width="@dimen/folder_preview_size"
         android:layout_height="@dimen/folder_preview_size"
         android:src="@drawable/portal_ring_inner_holo"/>
-    <com.android.launcher2.BubbleTextView
+    <com.android.launcher3.BubbleTextView
         android:id="@+id/folder_icon_name"
         style="@style/WorkspaceIcon.Landscape.Folder"/>
-</com.android.launcher2.FolderIcon>
+</com.android.launcher3.FolderIcon>
diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml
index aebb218420..f2d2b00e71 100644
--- a/res/layout-land/hotseat.xml
+++ b/res/layout-land/hotseat.xml
@@ -13,12 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Hotseat
+<com.android.launcher3.Hotseat
     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-auto/com.android.launcher3"
     launcher:cellCountX="1"
     launcher:cellCountY="@integer/hotseat_cell_count">
-    <com.android.launcher2.CellLayout
+    <com.android.launcher3.CellLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,4 +33,4 @@
         launcher:widthGap="@dimen/hotseat_width_gap"
         launcher:heightGap="@dimen/hotseat_height_gap"
         launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
+</com.android.launcher3.Hotseat>
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 88490987bb..02cde57d08 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -17,21 +17,21 @@
 <!-- Full screen view projects under the status bar and contains the background -->
 <FrameLayout
     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-auto/com.android.launcher3"
 
     android:id="@+id/launcher"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/workspace_bg">
 
-    <com.android.launcher2.DragLayer
+    <com.android.launcher3.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true">
 
         <!-- The workspace contains 5 screens of cells -->
-        <com.android.launcher2.Workspace
+        <com.android.launcher3.Workspace
             android:id="@+id/workspace"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -51,7 +51,7 @@
             <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
             <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
             <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-        </com.android.launcher2.Workspace>
+        </com.android.launcher3.Workspace>
 
         <include
             android:id="@+id/qsb_divider"
@@ -101,7 +101,7 @@
             android:layout_height="match_parent"
             android:visibility="gone" />
 
-        <com.android.launcher2.DrawableStateProxyView
+        <com.android.launcher3.DrawableStateProxyView
             android:id="@+id/voice_button_proxy"
             android:layout_width="@dimen/qsb_bar_height"
             android:layout_height="@dimen/app_icon_size"
@@ -117,5 +117,5 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="invisible" />
-    </com.android.launcher2.DragLayer>
-</FrameLayout>
\ No newline at end of file
+    </com.android.launcher3.DragLayer>
+</FrameLayout>
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
index 8cdee942c0..ab36361fe2 100644
--- a/res/layout-land/search_bar.xml
+++ b/res/layout-land/search_bar.xml
@@ -19,7 +19,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
    <!-- Global search icon -->
-   <com.android.launcher2.HolographicImageView
+   <com.android.launcher3.HolographicImageView
         style="@style/SearchButton"
         android:id="@+id/search_button"
         android:layout_width="match_parent"
@@ -34,7 +34,7 @@
         android:contentDescription="@string/accessibility_search_button" />
 
     <!-- Voice search icon -->
-    <com.android.launcher2.HolographicImageView
+    <com.android.launcher3.HolographicImageView
         style="@style/SearchButton"
         android:id="@+id/voice_button"
         android:layout_width="match_parent"
diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml
index 43d2a816f1..8bd9e351f4 100644
--- a/res/layout-land/workspace_cling.xml
+++ b/res/layout-land/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:drawIdentifier="workspace_landscape">
@@ -56,4 +56,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-port/all_apps_cling.xml b/res/layout-port/all_apps_cling.xml
index 6954fb2120..62284ec733 100644
--- a/res/layout-port/all_apps_cling.xml
+++ b/res/layout-port/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="all_apps_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -45,4 +45,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml
index ddc835420d..4dcc774d74 100644
--- a/res/layout-port/application.xml
+++ b/res/layout-port/application.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android"
    style="@style/WorkspaceIcon.Portrait"
    android:focusable="true"
    android:background="@drawable/focusable_view_bg" />
diff --git a/res/layout-port/apps_customize_application.xml b/res/layout-port/apps_customize_application.xml
index 84a8712d77..0b7bab6c5d 100644
--- a/res/layout-port/apps_customize_application.xml
+++ b/res/layout-port/apps_customize_application.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.PagedViewIcon
+<com.android.launcher3.PagedViewIcon
     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-auto/com.android.launcher3"
 
     style="@style/WorkspaceIcon.Portrait.AppsCustomize"
 
diff --git a/res/layout-port/folder_cling.xml b/res/layout-port/folder_cling.xml
index 820675d1d6..b91578fdb9 100644
--- a/res/layout-port/folder_cling.xml
+++ b/res/layout-port/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="folder_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -46,4 +46,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
index 5ee1327a35..686fb170c6 100644
--- a/res/layout-port/folder_icon.xml
+++ b/res/layout-port/folder_icon.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.FolderIcon
+<com.android.launcher3.FolderIcon
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +27,7 @@
         android:layout_width="@dimen/folder_preview_size"
         android:layout_height="@dimen/folder_preview_size"
         android:src="@drawable/portal_ring_inner_holo"/>
-    <com.android.launcher2.BubbleTextView
+    <com.android.launcher3.BubbleTextView
         android:id="@+id/folder_icon_name"
         style="@style/WorkspaceIcon.Portrait.Folder"/>
-</com.android.launcher2.FolderIcon>
+</com.android.launcher3.FolderIcon>
diff --git a/res/layout-port/hotseat.xml b/res/layout-port/hotseat.xml
index 4ca0bb8201..cab20b2dab 100644
--- a/res/layout-port/hotseat.xml
+++ b/res/layout-port/hotseat.xml
@@ -13,12 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Hotseat
+<com.android.launcher3.Hotseat
     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-auto/com.android.launcher3"
     launcher:cellCountX="@integer/hotseat_cell_count"
     launcher:cellCountY="1">
-    <com.android.launcher2.CellLayout
+    <com.android.launcher3.CellLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -33,4 +33,4 @@
         launcher:widthGap="@dimen/hotseat_width_gap"
         launcher:heightGap="@dimen/hotseat_height_gap"
         launcher:maxGap="@dimen/workspace_max_gap" />
-</com.android.launcher2.Hotseat>
+</com.android.launcher3.Hotseat>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 346d29b5a5..780f4366ed 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -17,14 +17,14 @@
 <!-- Full screen view projects under the status bar and contains the background -->
 <FrameLayout
     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-auto/com.android.launcher3"
 
     android:id="@+id/launcher"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/workspace_bg">
 
-    <com.android.launcher2.DragLayer
+    <com.android.launcher3.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -49,7 +49,7 @@
             android:layout_marginBottom="@dimen/button_bar_height" />
 
         <!-- The workspace contains 5 screens of cells -->
-        <com.android.launcher2.Workspace
+        <com.android.launcher3.Workspace
             android:id="@+id/workspace"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -69,7 +69,7 @@
             <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
             <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
             <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-        </com.android.launcher2.Workspace>
+        </com.android.launcher3.Workspace>
 
         <include layout="@layout/hotseat"
             android:id="@+id/hotseat"
@@ -96,7 +96,7 @@
             android:layout_height="match_parent"
             android:visibility="gone" />
 
-        <com.android.launcher2.DrawableStateProxyView
+        <com.android.launcher3.DrawableStateProxyView
             android:id="@+id/voice_button_proxy"
             android:layout_width="80dp"
             android:layout_height="@dimen/qsb_bar_height"
@@ -111,5 +111,5 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="invisible" />
-    </com.android.launcher2.DragLayer>
+    </com.android.launcher3.DragLayer>
 </FrameLayout>
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
index 62bdb22fc1..1e12e9eb8b 100644
--- a/res/layout-port/search_bar.xml
+++ b/res/layout-port/search_bar.xml
@@ -15,14 +15,14 @@
 -->
 <RelativeLayout
     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-auto/com.android.launcher3"
     style="@style/SearchDropTargetBar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/search_bar_height"
     android:layout_gravity="bottom|center_horizontal"
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
-   <com.android.launcher2.HolographicLinearLayout
+   <com.android.launcher3.HolographicLinearLayout
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/search_button"
         android:id="@+id/search_button_container"
@@ -44,10 +44,10 @@
             android:scaleType="fitStart"
             android:src="@drawable/ic_home_search_normal_holo"
             android:adjustViewBounds="true" />
-    </com.android.launcher2.HolographicLinearLayout>
+    </com.android.launcher3.HolographicLinearLayout>
 
     <!-- Voice search icon -->
-    <com.android.launcher2.HolographicLinearLayout
+    <com.android.launcher3.HolographicLinearLayout
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/voice_button"
         android:id="@+id/voice_button_container"
@@ -69,5 +69,5 @@
             android:scaleType="fitEnd"
             android:src="@drawable/ic_home_voice_search_holo"
             android:adjustViewBounds="true" />
-    </com.android.launcher2.HolographicLinearLayout>
+    </com.android.launcher3.HolographicLinearLayout>
 </RelativeLayout>
diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml
index ca71a3b446..052e1a0914 100644
--- a/res/layout-port/workspace_cling.xml
+++ b/res/layout-port/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:drawIdentifier="workspace_portrait">
@@ -59,4 +59,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml
index fc32c4a89f..cf65e410db 100644
--- a/res/layout-sw600dp-port/all_apps_cling.xml
+++ b/res/layout-sw600dp-port/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="all_apps_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -47,4 +47,4 @@
         android:layout_marginEnd="36dp"
         android:layout_gravity="top|end"
         android:onClick="dismissAllAppsCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
index 356bae55c7..87086cb62d 100644
--- a/res/layout-sw600dp-port/folder_cling.xml
+++ b/res/layout-sw600dp-port/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="folder_portrait">
     <FrameLayout
         android:layout_width="match_parent"
@@ -48,4 +48,4 @@
         android:layout_marginEnd="36dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissFolderCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp-port/folder_cling.xml b/res/layout-sw720dp-port/folder_cling.xml
index d4d66dc74f..40d4e20a5d 100644
--- a/res/layout-sw720dp-port/folder_cling.xml
+++ b/res/layout-sw720dp-port/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="folder_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -43,4 +43,4 @@
                 android:onClick="dismissFolderCling" />
         </LinearLayout>
     </FrameLayout>
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml
index d6e19d302b..824d84f0dd 100644
--- a/res/layout-sw720dp/all_apps_cling.xml
+++ b/res/layout-sw720dp/all_apps_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="all_apps_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -43,4 +43,4 @@
                 android:onClick="dismissAllAppsCling" />
         </LinearLayout>
     </FrameLayout>
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/folder_cling.xml b/res/layout-sw720dp/folder_cling.xml
index f66da7bc7b..4193838cae 100644
--- a/res/layout-sw720dp/folder_cling.xml
+++ b/res/layout-sw720dp/folder_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     launcher:drawIdentifier="folder_large">
     <FrameLayout
         android:layout_width="match_parent"
@@ -43,4 +43,4 @@
                 android:onClick="dismissFolderCling" />
         </LinearLayout>
     </FrameLayout>
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml
index a8faf3665c..f69f68d95f 100644
--- a/res/layout-sw720dp/hotseat.xml
+++ b/res/layout-sw720dp/hotseat.xml
@@ -13,12 +13,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Hotseat
+<com.android.launcher3.Hotseat
     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-auto/com.android.launcher3"
     launcher:cellCountX="@integer/hotseat_cell_count"
     launcher:cellCountY="1">
-    <com.android.launcher2.CellLayout
+    <com.android.launcher3.CellLayout
         android:id="@+id/layout"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -33,4 +33,4 @@
         launcher:widthGap="@dimen/hotseat_width_gap"
         launcher:heightGap="@dimen/hotseat_height_gap"
         launcher:maxGap="@dimen/hotseat_width_gap" />
-</com.android.launcher2.Hotseat>
+</com.android.launcher3.Hotseat>
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 2bacf362df..d798aff92a 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -17,14 +17,14 @@
 <!-- Full screen view projects under the status bar and contains the background -->
 <FrameLayout
     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-auto/com.android.launcher3"
 
     android:id="@+id/launcher"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/workspace_bg">
 
-    <com.android.launcher2.DragLayer
+    <com.android.launcher3.DragLayer
         android:id="@+id/drag_layer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -49,7 +49,7 @@
             android:layout_marginBottom="@dimen/button_bar_height_plus_padding" />
 
         <!-- The workspace contains 5 screens of cells -->
-        <com.android.launcher2.Workspace
+        <com.android.launcher3.Workspace
             android:id="@+id/workspace"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -69,7 +69,7 @@
             <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
             <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
             <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-        </com.android.launcher2.Workspace>
+        </com.android.launcher3.Workspace>
 
         <include layout="@layout/hotseat"
             android:id="@+id/hotseat"
@@ -96,7 +96,7 @@
             android:layout_height="match_parent"
             android:visibility="gone" />
 
-        <com.android.launcher2.DrawableStateProxyView
+        <com.android.launcher3.DrawableStateProxyView
             android:id="@+id/voice_button_proxy"
             android:layout_width="80dp"
             android:layout_height="@dimen/qsb_bar_height"
@@ -112,5 +112,5 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="invisible" />
-    </com.android.launcher2.DragLayer>
+    </com.android.launcher3.DragLayer>
 </FrameLayout>
diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml
index 7cf79b8b59..44c969bef0 100644
--- a/res/layout-sw720dp/search_bar.xml
+++ b/res/layout-sw720dp/search_bar.xml
@@ -15,14 +15,14 @@
 -->
 <RelativeLayout
     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-auto/com.android.launcher3"
     style="@style/SearchDropTargetBar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/search_bar_height"
     android:layout_gravity="bottom|center_horizontal"
     android:background="@drawable/search_frame">
    <!-- Global search icon -->
-   <com.android.launcher2.HolographicLinearLayout
+   <com.android.launcher3.HolographicLinearLayout
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/search_button"
         android:id="@+id/search_button_container"
@@ -43,10 +43,10 @@
             android:layout_height="match_parent"
             android:src="@drawable/ic_home_search_normal_holo"
             android:adjustViewBounds="true" />
-    </com.android.launcher2.HolographicLinearLayout>
+    </com.android.launcher3.HolographicLinearLayout>
 
     <!-- Voice search icon -->
-    <com.android.launcher2.HolographicLinearLayout
+    <com.android.launcher3.HolographicLinearLayout
         style="@style/SearchButton"
         launcher:sourceImageViewId="@+id/voice_button"
         android:id="@+id/voice_button_container"
@@ -67,5 +67,5 @@
             android:layout_height="match_parent"
             android:src="@drawable/ic_home_voice_search_holo"
             android:adjustViewBounds="true" />
-    </com.android.launcher2.HolographicLinearLayout>
+    </com.android.launcher3.HolographicLinearLayout>
 </RelativeLayout>
diff --git a/res/layout-sw720dp/wallpaper_item.xml b/res/layout-sw720dp/wallpaper_item.xml
index 9461e3b554..f3c32173f8 100644
--- a/res/layout-sw720dp/wallpaper_item.xml
+++ b/res/layout-sw720dp/wallpaper_item.xml
@@ -23,4 +23,4 @@
         android:layout_height="@dimen/wallpaper_chooser_grid_height"
         android:scaleType="centerCrop"
         android:focusable="true" />
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml
index bf2abfdb4d..00ed529e09 100644
--- a/res/layout-sw720dp/workspace.xml
+++ b/res/layout-sw720dp/workspace.xml
@@ -16,9 +16,9 @@
 
 <!-- The workspace contains 5 screens of cells -->
 
-<com.android.launcher2.Workspace
+<com.android.launcher3.Workspace
     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-auto/com.android.launcher3"
     android:paddingStart="@dimen/workspace_left_padding"
     android:paddingEnd="@dimen/workspace_right_padding"
     android:paddingTop="@dimen/workspace_top_padding"
@@ -30,4 +30,4 @@
       <include android:id="@+id/cell3" layout="@layout/workspace_screen" />
       <include android:id="@+id/cell4" layout="@layout/workspace_screen" />
       <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
-</com.android.launcher2.Workspace>
\ No newline at end of file
+</com.android.launcher3.Workspace>
diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml
index ca71a3b446..052e1a0914 100644
--- a/res/layout-sw720dp/workspace_cling.xml
+++ b/res/layout-sw720dp/workspace_cling.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:drawIdentifier="workspace_portrait">
@@ -59,4 +59,4 @@
         android:layout_marginEnd="10dp"
         android:layout_gravity="bottom|end"
         android:onClick="dismissWorkspaceCling" />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index a9d7dedede..a67cf919a0 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.AppsCustomizeTabHost
+<com.android.launcher3.AppsCustomizeTabHost
     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-auto/com.android.launcher3"
     android:background="#FF000000">
     <LinearLayout
         android:id="@+id/apps_customize_content"
@@ -31,7 +31,7 @@
             android:layout_height="@dimen/apps_customize_tab_bar_height"
             android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top"
             android:layout_gravity="center_horizontal">
-            <com.android.launcher2.FocusOnlyTabWidget
+            <com.android.launcher3.FocusOnlyTabWidget
                 android:id="@android:id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -51,7 +51,7 @@
             android:id="@android:id/tabcontent"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <com.android.launcher2.AppsCustomizePagedView
+            <com.android.launcher3.AppsCustomizePagedView
                 android:id="@+id/apps_customize_pane_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -91,4 +91,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
-</com.android.launcher2.AppsCustomizeTabHost>
+</com.android.launcher3.AppsCustomizeTabHost>
diff --git a/res/layout/apps_customize_widget.xml b/res/layout/apps_customize_widget.xml
index 6bb7943456..ad677e9287 100644
--- a/res/layout/apps_customize_widget.xml
+++ b/res/layout/apps_customize_widget.xml
@@ -13,9 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.PagedViewWidget
+<com.android.launcher3.PagedViewWidget
     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-auto/com.android.launcher3"
 
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,7 +26,7 @@
     android:focusable="true">
 
     <!-- The preview of the widget or shortcut. -->
-    <com.android.launcher2.PagedViewWidgetImageView
+    <com.android.launcher3.PagedViewWidgetImageView
         android:id="@+id/widget_preview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -75,4 +75,4 @@
     </LinearLayout>
 
 
-</com.android.launcher2.PagedViewWidget>
+</com.android.launcher3.PagedViewWidget>
diff --git a/res/layout/custom_workspace_cling.xml b/res/layout/custom_workspace_cling.xml
index b3e15f5894..3744f2e4bc 100644
--- a/res/layout/custom_workspace_cling.xml
+++ b/res/layout/custom_workspace_cling.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 <!-- dummy layout, to be replaced in overlays -->
-<com.android.launcher2.Cling
+<com.android.launcher3.Cling
     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-auto/com.android.launcher3"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     launcher:drawIdentifier="workspace_custom">
@@ -29,4 +29,4 @@
         android:gravity="start"
         android:layout_gravity="bottom|start"
     />
-</com.android.launcher2.Cling>
+</com.android.launcher3.Cling>
diff --git a/res/layout/drop_target_bar.xml b/res/layout/drop_target_bar.xml
index ca3f554047..f38a500144 100644
--- a/res/layout/drop_target_bar.xml
+++ b/res/layout/drop_target_bar.xml
@@ -19,7 +19,7 @@
         style="@style/DropTargetButtonContainer"
         android:layout_weight="1">
         <!-- Delete target -->
-        <com.android.launcher2.DeleteDropTarget
+        <com.android.launcher3.DeleteDropTarget
             style="@style/DropTargetButton"
             android:id="@+id/delete_target_text"
             android:text="@string/delete_zone_label_workspace"
@@ -30,10 +30,10 @@
         style="@style/DropTargetButtonContainer"
         android:layout_weight="1">
         <!-- Info target -->
-        <com.android.launcher2.InfoDropTarget
+        <com.android.launcher3.InfoDropTarget
             style="@style/DropTargetButton"
             android:id="@+id/info_target_text"
             android:text="@string/info_target_label"
             android:drawableStart="@drawable/info_target_selector" />
     </FrameLayout>
-</merge>
\ No newline at end of file
+</merge>
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
index 322dc006f9..56e052346e 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/qsb_bar.xml
@@ -13,7 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.launcher2.SearchDropTargetBar
+<com.android.launcher3.SearchDropTargetBar
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/QSBBar"
     android:focusable="false">
@@ -30,4 +30,4 @@
         <include
             layout="@layout/drop_target_bar" />
     </LinearLayout>
-</com.android.launcher2.SearchDropTargetBar>
+</com.android.launcher3.SearchDropTargetBar>
diff --git a/res/layout/tab_widget_indicator.xml b/res/layout/tab_widget_indicator.xml
index df43d3ddd6..de7c50ec45 100644
--- a/res/layout/tab_widget_indicator.xml
+++ b/res/layout/tab_widget_indicator.xml
@@ -14,6 +14,6 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.AccessibleTabView
+<com.android.launcher3.AccessibleTabView
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/TabIndicator.AppsCustomize" />
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index aa4eb1c9c9..8c72dd673e 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -14,15 +14,15 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.Folder
+<com.android.launcher3.Folder
     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-auto/com.android.launcher3"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="@drawable/portal_container_holo">
 
-    <com.android.launcher2.CellLayout
+    <com.android.launcher3.CellLayout
         android:id="@+id/folder_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
         launcher:cellWidth="@dimen/folder_cell_width"
         launcher:cellHeight="@dimen/folder_cell_height" />
 
-    <com.android.launcher2.FolderEditText
+    <com.android.launcher3.FolderEditText
         android:id="@+id/folder_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -52,4 +52,4 @@
         android:gravity="center_horizontal"
         android:singleLine="true"
         android:imeOptions="flagNoExtractUi"/>
-</com.android.launcher2.Folder>
+</com.android.launcher3.Folder>
diff --git a/res/layout/wallpaper_chooser_base.xml b/res/layout/wallpaper_chooser_base.xml
index fa8ea93721..14906674e9 100644
--- a/res/layout/wallpaper_chooser_base.xml
+++ b/res/layout/wallpaper_chooser_base.xml
@@ -21,7 +21,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <fragment class="com.android.launcher2.WallpaperChooserDialogFragment"
+    <fragment class="com.android.launcher3.WallpaperChooserDialogFragment"
         android:id="@+id/wallpaper_chooser_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml
index 6538532c11..acc9f66516 100644
--- a/res/layout/workspace_screen.xml
+++ b/res/layout/workspace_screen.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<com.android.launcher2.CellLayout
+<com.android.launcher3.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-auto/com.android.launcher3"
 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -30,4 +30,4 @@
     launcher:cellHeight="@dimen/workspace_cell_height"
     launcher:widthGap="@dimen/workspace_width_gap"
     launcher:heightGap="@dimen/workspace_height_gap"
-    launcher:maxGap="@dimen/workspace_max_gap" />
\ No newline at end of file
+    launcher:maxGap="@dimen/workspace_max_gap" />
diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png
index 8945ada344..b556d7abad 100644
Binary files a/res/mipmap-hdpi/ic_launcher_home.png and b/res/mipmap-hdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
index 72bd80a2f6..961bb7dbd5 100644
Binary files a/res/mipmap-mdpi/ic_launcher_home.png and b/res/mipmap-mdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
index 7bef13ca73..46ec2b7753 100644
Binary files a/res/mipmap-xhdpi/ic_launcher_home.png and b/res/mipmap-xhdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png
new file mode 100644
index 0000000000..d2975a39f0
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_home.png differ
diff --git a/res/values-sw720dp/wallpapers.xml b/res/values-sw720dp/wallpapers.xml
index 8b01477e4b..1e340e4b28 100644
--- a/res/values-sw720dp/wallpapers.xml
+++ b/res/values-sw720dp/wallpapers.xml
@@ -17,16 +17,5 @@
 
 <resources>
     <string-array name="wallpapers" translatable="false">
-        <item>wallpaper_00</item>
-        <item>wallpaper_01</item>
-        <item>wallpaper_02</item>
-        <item>wallpaper_03</item>
-        <item>wallpaper_04</item>
-        <item>wallpaper_05</item>
-        <item>wallpaper_06</item>
-        <item>wallpaper_07</item>
-        <item>wallpaper_08</item>
-        <item>wallpaper_09</item>
-        <item>wallpaper_10</item>
     </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ead582ef50..102e43e77f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@
     <!-- General -->
     <skip />
     <!-- Application name -->
-    <string name="application_name">Launcher</string>
+    <string name="application_name">Launcher3</string>
     <!-- Accessibility-facing application name -->
     <string name="home">Home</string>
     <!-- Name for all applications running as this uid. -->
diff --git a/res/values/wallpapers.xml b/res/values/wallpapers.xml
index ed56b18ff0..1e340e4b28 100644
--- a/res/values/wallpapers.xml
+++ b/res/values/wallpapers.xml
@@ -17,17 +17,5 @@
 
 <resources>
     <string-array name="wallpapers" translatable="false">
-        <item>wallpaper_01</item>
-        <item>wallpaper_02</item>
-        <item>wallpaper_03</item>
-        <item>wallpaper_04</item>
-        <item>wallpaper_05</item>
-        <item>wallpaper_06</item>
-        <item>wallpaper_07</item>
-        <item>wallpaper_08</item>
-        <item>wallpaper_09</item>
-        <item>wallpaper_10</item>
-        <item>wallpaper_11</item>
-        <item>wallpaper_12</item>
     </string-array>
 </resources>
diff --git a/res/xml-sw600dp/default_workspace.xml b/res/xml-sw600dp/default_workspace.xml
index 05371696d0..090c7a7afc 100644
--- a/res/xml-sw600dp/default_workspace.xml
+++ b/res/xml-sw600dp/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-auto/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
diff --git a/res/xml-sw720dp/default_workspace.xml b/res/xml-sw720dp/default_workspace.xml
index 6302d7e04e..1c1d70e92c 100644
--- a/res/xml-sw720dp/default_workspace.xml
+++ b/res/xml-sw720dp/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-auto/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 93338d3b71..26fc504f03 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-auto/com.android.launcher3">
     <!-- Far-left screen [0] -->
 
     <!-- Left screen [1] -->
diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml
index ba35b151f7..38442b91cd 100644
--- a/res/xml/update_workspace.xml
+++ b/res/xml/update_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-auto/com.android.launcher3">
     <!-- Update the db with new hotseat items.  Note that we reference the browser's original
          package name. -->
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
diff --git a/res/xml/wallpaper_picker_preview.xml b/res/xml/wallpaper_picker_preview.xml
index d52e0e03f2..ce7124cef3 100644
--- a/res/xml/wallpaper_picker_preview.xml
+++ b/res/xml/wallpaper_picker_preview.xml
@@ -17,4 +17,4 @@
 <wallpaper-preview
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:staticWallpaperPreview="@drawable/wallpaper_picker_preview">
-</wallpaper-preview>
\ No newline at end of file
+</wallpaper-preview>
diff --git a/src/com/android/launcher2/AccessibleTabView.java b/src/com/android/launcher3/AccessibleTabView.java
similarity index 98%
rename from src/com/android/launcher2/AccessibleTabView.java
rename to src/com/android/launcher3/AccessibleTabView.java
index 101f139e73..90a78656ed 100644
--- a/src/com/android/launcher2/AccessibleTabView.java
+++ b/src/com/android/launcher3/AccessibleTabView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/android/launcher3/AddAdapter.java
similarity index 97%
rename from src/com/android/launcher2/AddAdapter.java
rename to src/com/android/launcher3/AddAdapter.java
index c0bb17b727..ad15e75c65 100644
--- a/src/com/android/launcher2/AddAdapter.java
+++ b/src/com/android/launcher3/AddAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -27,7 +27,7 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 /**
  * Adapter showing the types of items that can be added to a {@link Workspace}.
diff --git a/src/com/android/launcher2/Alarm.java b/src/com/android/launcher3/Alarm.java
similarity index 98%
rename from src/com/android/launcher2/Alarm.java
rename to src/com/android/launcher3/Alarm.java
index 7cd21c3278..91f9bd0913 100644
--- a/src/com/android/launcher2/Alarm.java
+++ b/src/com/android/launcher3/Alarm.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.os.Handler;
 
diff --git a/src/com/android/launcher2/AllAppsList.java b/src/com/android/launcher3/AllAppsList.java
similarity index 99%
rename from src/com/android/launcher2/AllAppsList.java
rename to src/com/android/launcher3/AllAppsList.java
index 051b0bd1d7..e74dc21339 100644
--- a/src/com/android/launcher2/AllAppsList.java
+++ b/src/com/android/launcher3/AllAppsList.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher3/AppWidgetResizeFrame.java
similarity index 99%
rename from src/com/android/launcher2/AppWidgetResizeFrame.java
rename to src/com/android/launcher3/AppWidgetResizeFrame.java
index 4b544147e1..8e968f83c0 100644
--- a/src/com/android/launcher2/AppWidgetResizeFrame.java
+++ b/src/com/android/launcher3/AppWidgetResizeFrame.java
@@ -1,4 +1,4 @@
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ -13,7 +13,7 @@ import android.view.Gravity;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class AppWidgetResizeFrame extends FrameLayout {
     private LauncherAppWidgetHostView mWidgetView;
diff --git a/src/com/android/launcher2/ApplicationInfo.java b/src/com/android/launcher3/ApplicationInfo.java
similarity index 99%
rename from src/com/android/launcher2/ApplicationInfo.java
rename to src/com/android/launcher3/ApplicationInfo.java
index eda8c2520c..4659e7e859 100644
--- a/src/com/android/launcher2/ApplicationInfo.java
+++ b/src/com/android/launcher3/ApplicationInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.ComponentName;
 import android.content.Intent;
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
similarity index 99%
rename from src/com/android/launcher2/AppsCustomizePagedView.java
rename to src/com/android/launcher3/AppsCustomizePagedView.java
index 95ce33752b..43a5259a69 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.AnimatorSet;
 import android.animation.ValueAnimator;
@@ -51,8 +51,8 @@ import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.android.launcher.R;
-import com.android.launcher2.DropTarget.DragObject;
+import com.android.launcher3.R;
+import com.android.launcher3.DropTarget.DragObject;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java
similarity index 99%
rename from src/com/android/launcher2/AppsCustomizeTabHost.java
rename to src/com/android/launcher3/AppsCustomizeTabHost.java
index 225b056280..5d50fec03d 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher3/AppsCustomizeTabHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -33,7 +33,7 @@ import android.widget.TabHost;
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
similarity index 99%
rename from src/com/android/launcher2/BubbleTextView.java
rename to src/com/android/launcher3/BubbleTextView.java
index c5bed16942..7cac8a68c3 100644
--- a/src/com/android/launcher2/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java
similarity index 98%
rename from src/com/android/launcher2/ButtonDropTarget.java
rename to src/com/android/launcher3/ButtonDropTarget.java
index ff0813add0..a7486a8e32 100644
--- a/src/com/android/launcher2/ButtonDropTarget.java
+++ b/src/com/android/launcher3/ButtonDropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -25,7 +25,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 
 /**
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher3/CellLayout.java
similarity index 99%
rename from src/com/android/launcher2/CellLayout.java
rename to src/com/android/launcher3/CellLayout.java
index 024bb37af4..842037c319 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -48,8 +48,8 @@ import android.view.animation.Animation;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LayoutAnimationController;
 
-import com.android.launcher.R;
-import com.android.launcher2.FolderIcon.FolderRingAnimator;
+import com.android.launcher3.R;
+import com.android.launcher3.FolderIcon.FolderRingAnimator;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/com/android/launcher2/CheckLongPressHelper.java b/src/com/android/launcher3/CheckLongPressHelper.java
similarity index 98%
rename from src/com/android/launcher2/CheckLongPressHelper.java
rename to src/com/android/launcher3/CheckLongPressHelper.java
index 5c3752ad6d..7760f4e0cb 100644
--- a/src/com/android/launcher2/CheckLongPressHelper.java
+++ b/src/com/android/launcher3/CheckLongPressHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.view.View;
 
diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher3/Cling.java
similarity index 99%
rename from src/com/android/launcher2/Cling.java
rename to src/com/android/launcher3/Cling.java
index 971d9ff533..6bb183ce3d 100644
--- a/src/com/android/launcher2/Cling.java
+++ b/src/com/android/launcher3/Cling.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -33,7 +33,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class Cling extends FrameLayout {
 
diff --git a/src/com/android/launcher2/DeferredHandler.java b/src/com/android/launcher3/DeferredHandler.java
similarity index 99%
rename from src/com/android/launcher2/DeferredHandler.java
rename to src/com/android/launcher3/DeferredHandler.java
index cee27dfa86..92ecf96438 100644
--- a/src/com/android/launcher2/DeferredHandler.java
+++ b/src/com/android/launcher3/DeferredHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/src/com/android/launcher2/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
similarity index 99%
rename from src/com/android/launcher2/DeleteDropTarget.java
rename to src/com/android/launcher3/DeleteDropTarget.java
index d575b8f58f..eba1547321 100644
--- a/src/com/android/launcher2/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
@@ -34,7 +34,7 @@ import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class DeleteDropTarget extends ButtonDropTarget {
     private static int DELETE_ANIMATION_DURATION = 285;
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher3/DragController.java
similarity index 99%
rename from src/com/android/launcher2/DragController.java
rename to src/com/android/launcher3/DragController.java
index d15cb6e066..86355890e0 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher3/DragController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -33,7 +33,7 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.inputmethod.InputMethodManager;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher3/DragLayer.java
similarity index 99%
rename from src/com/android/launcher2/DragLayer.java
rename to src/com/android/launcher3/DragLayer.java
index fccc1a6043..5a1b4ccd0f 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher3/DragLayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -40,7 +40,7 @@ import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/DragScroller.java b/src/com/android/launcher3/DragScroller.java
similarity index 97%
rename from src/com/android/launcher2/DragScroller.java
rename to src/com/android/launcher3/DragScroller.java
index a3ee6c2371..e261f15d89 100644
--- a/src/com/android/launcher2/DragScroller.java
+++ b/src/com/android/launcher3/DragScroller.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 /**
  * Handles scrolling while dragging
diff --git a/src/com/android/launcher2/DragSource.java b/src/com/android/launcher3/DragSource.java
similarity index 94%
rename from src/com/android/launcher2/DragSource.java
rename to src/com/android/launcher3/DragSource.java
index 54404770a9..2ef99ae08a 100644
--- a/src/com/android/launcher2/DragSource.java
+++ b/src/com/android/launcher3/DragSource.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.view.View;
 
-import com.android.launcher2.DropTarget.DragObject;
+import com.android.launcher3.DropTarget.DragObject;
 
 /**
  * Interface defining an object that can originate a drag.
diff --git a/src/com/android/launcher2/DragView.java b/src/com/android/launcher3/DragView.java
similarity index 99%
rename from src/com/android/launcher2/DragView.java
rename to src/com/android/launcher3/DragView.java
index b25ae6112c..686cf62ff0 100644
--- a/src/com/android/launcher2/DragView.java
+++ b/src/com/android/launcher3/DragView.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
@@ -30,7 +30,7 @@ import android.graphics.Rect;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class DragView extends View {
     private static float sDragAlpha = 1f;
diff --git a/src/com/android/launcher2/DrawableStateProxyView.java b/src/com/android/launcher3/DrawableStateProxyView.java
similarity index 96%
rename from src/com/android/launcher2/DrawableStateProxyView.java
rename to src/com/android/launcher3/DrawableStateProxyView.java
index 5d2f6e0a2f..196e2f2e12 100644
--- a/src/com/android/launcher2/DrawableStateProxyView.java
+++ b/src/com/android/launcher3/DrawableStateProxyView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -23,7 +23,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class DrawableStateProxyView extends LinearLayout {
 
diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/android/launcher3/DropTarget.java
similarity index 99%
rename from src/com/android/launcher2/DropTarget.java
rename to src/com/android/launcher3/DropTarget.java
index d627a4c2ee..3ecb8ff085 100644
--- a/src/com/android/launcher2/DropTarget.java
+++ b/src/com/android/launcher3/DropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.graphics.PointF;
diff --git a/src/com/android/launcher2/FastBitmapDrawable.java b/src/com/android/launcher3/FastBitmapDrawable.java
similarity index 98%
rename from src/com/android/launcher2/FastBitmapDrawable.java
rename to src/com/android/launcher3/FastBitmapDrawable.java
index 3c39d278a7..14760c7b69 100644
--- a/src/com/android/launcher2/FastBitmapDrawable.java
+++ b/src/com/android/launcher3/FastBitmapDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/src/com/android/launcher2/FirstFrameAnimatorHelper.java b/src/com/android/launcher3/FirstFrameAnimatorHelper.java
similarity index 99%
rename from src/com/android/launcher2/FirstFrameAnimatorHelper.java
rename to src/com/android/launcher3/FirstFrameAnimatorHelper.java
index 38154860c4..78fdadd4fa 100644
--- a/src/com/android/launcher2/FirstFrameAnimatorHelper.java
+++ b/src/com/android/launcher3/FirstFrameAnimatorHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/launcher2/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
similarity index 99%
rename from src/com/android/launcher2/FocusHelper.java
rename to src/com/android/launcher3/FocusHelper.java
index e9f986d762..94c5820cec 100644
--- a/src/com/android/launcher2/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.res.Configuration;
 import android.view.KeyEvent;
@@ -24,7 +24,7 @@ import android.view.ViewParent;
 import android.widget.TabHost;
 import android.widget.TabWidget;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/launcher2/FocusOnlyTabWidget.java b/src/com/android/launcher3/FocusOnlyTabWidget.java
similarity index 98%
rename from src/com/android/launcher2/FocusOnlyTabWidget.java
rename to src/com/android/launcher3/FocusOnlyTabWidget.java
index 8e9f58c617..08fc311bca 100644
--- a/src/com/android/launcher2/FocusOnlyTabWidget.java
+++ b/src/com/android/launcher3/FocusOnlyTabWidget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher3/Folder.java
similarity index 99%
rename from src/com/android/launcher2/Folder.java
rename to src/com/android/launcher3/Folder.java
index ee150088b1..a7b5c5c546 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -44,8 +44,8 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
-import com.android.launcher2.FolderInfo.FolderListener;
+import com.android.launcher3.R;
+import com.android.launcher3.FolderInfo.FolderListener;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/android/launcher2/FolderEditText.java b/src/com/android/launcher3/FolderEditText.java
similarity index 96%
rename from src/com/android/launcher2/FolderEditText.java
rename to src/com/android/launcher3/FolderEditText.java
index 13169bd51d..c311008990 100644
--- a/src/com/android/launcher2/FolderEditText.java
+++ b/src/com/android/launcher3/FolderEditText.java
@@ -1,4 +1,4 @@
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
similarity index 99%
rename from src/com/android/launcher2/FolderIcon.java
rename to src/com/android/launcher3/FolderIcon.java
index 33650c50aa..e11d7d18ae 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -39,9 +39,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
-import com.android.launcher2.DropTarget.DragObject;
-import com.android.launcher2.FolderInfo.FolderListener;
+import com.android.launcher3.R;
+import com.android.launcher3.DropTarget.DragObject;
+import com.android.launcher3.FolderInfo.FolderListener;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
similarity index 98%
rename from src/com/android/launcher2/FolderInfo.java
rename to src/com/android/launcher3/FolderInfo.java
index dbac90ec5d..6d45e59ced 100644
--- a/src/com/android/launcher2/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/HandleView.java b/src/com/android/launcher3/HandleView.java
similarity index 97%
rename from src/com/android/launcher2/HandleView.java
rename to src/com/android/launcher3/HandleView.java
index d77138b0a8..6cb51da316 100644
--- a/src/com/android/launcher2/HandleView.java
+++ b/src/com/android/launcher3/HandleView.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -24,7 +24,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class HandleView extends ImageView {
     private static final int ORIENTATION_HORIZONTAL = 1;
diff --git a/src/com/android/launcher2/HideFromAccessibilityHelper.java b/src/com/android/launcher3/HideFromAccessibilityHelper.java
similarity index 99%
rename from src/com/android/launcher2/HideFromAccessibilityHelper.java
rename to src/com/android/launcher3/HideFromAccessibilityHelper.java
index 0b2ce5ba61..33adf773c3 100644
--- a/src/com/android/launcher2/HideFromAccessibilityHelper.java
+++ b/src/com/android/launcher3/HideFromAccessibilityHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/launcher2/HolographicImageView.java b/src/com/android/launcher3/HolographicImageView.java
similarity index 98%
rename from src/com/android/launcher2/HolographicImageView.java
rename to src/com/android/launcher3/HolographicImageView.java
index 9e551e0471..0ad82a70c8 100644
--- a/src/com/android/launcher2/HolographicImageView.java
+++ b/src/com/android/launcher3/HolographicImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/android/launcher2/HolographicLinearLayout.java b/src/com/android/launcher3/HolographicLinearLayout.java
similarity index 97%
rename from src/com/android/launcher2/HolographicLinearLayout.java
rename to src/com/android/launcher3/HolographicLinearLayout.java
index 0f997d5fa1..73d4c3a015 100644
--- a/src/com/android/launcher2/HolographicLinearLayout.java
+++ b/src/com/android/launcher3/HolographicLinearLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -25,7 +25,7 @@ import android.util.AttributeSet;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class HolographicLinearLayout extends LinearLayout {
 
diff --git a/src/com/android/launcher2/HolographicOutlineHelper.java b/src/com/android/launcher3/HolographicOutlineHelper.java
similarity index 99%
rename from src/com/android/launcher2/HolographicOutlineHelper.java
rename to src/com/android/launcher3/HolographicOutlineHelper.java
index 1e990dcff7..2decc3d228 100644
--- a/src/com/android/launcher2/HolographicOutlineHelper.java
+++ b/src/com/android/launcher3/HolographicOutlineHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.graphics.Bitmap;
 import android.graphics.BlurMaskFilter;
diff --git a/src/com/android/launcher2/HolographicViewHelper.java b/src/com/android/launcher3/HolographicViewHelper.java
similarity index 99%
rename from src/com/android/launcher2/HolographicViewHelper.java
rename to src/com/android/launcher3/HolographicViewHelper.java
index 93d7853518..9d3ad70a8b 100644
--- a/src/com/android/launcher2/HolographicViewHelper.java
+++ b/src/com/android/launcher3/HolographicViewHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/src/com/android/launcher2/Hotseat.java b/src/com/android/launcher3/Hotseat.java
similarity index 98%
rename from src/com/android/launcher2/Hotseat.java
rename to src/com/android/launcher3/Hotseat.java
index c122695eb6..2844d245eb 100644
--- a/src/com/android/launcher2/Hotseat.java
+++ b/src/com/android/launcher3/Hotseat.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -26,7 +26,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class Hotseat extends FrameLayout {
     @SuppressWarnings("unused")
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher3/IconCache.java
similarity index 99%
rename from src/com/android/launcher2/IconCache.java
rename to src/com/android/launcher3/IconCache.java
index aa19545bdb..774f27e1ca 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.app.ActivityManager;
 import android.content.ComponentName;
diff --git a/src/com/android/launcher2/InfoDropTarget.java b/src/com/android/launcher3/InfoDropTarget.java
similarity index 98%
rename from src/com/android/launcher2/InfoDropTarget.java
rename to src/com/android/launcher3/InfoDropTarget.java
index 850cc1fe83..9f1b0169c7 100644
--- a/src/com/android/launcher2/InfoDropTarget.java
+++ b/src/com/android/launcher3/InfoDropTarget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -26,7 +26,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 public class InfoDropTarget extends ButtonDropTarget {
 
diff --git a/src/com/android/launcher2/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
similarity index 98%
rename from src/com/android/launcher2/InstallShortcutReceiver.java
rename to src/com/android/launcher3/InstallShortcutReceiver.java
index 2e86a7f05c..a0ea93b727 100644
--- a/src/com/android/launcher2/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,7 +28,7 @@ import android.util.Base64;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -39,7 +39,7 @@ import org.json.*;
 
 public class InstallShortcutReceiver extends BroadcastReceiver {
     public static final String ACTION_INSTALL_SHORTCUT =
-            "com.android.launcher.action.INSTALL_SHORTCUT";
+            "com.android.launcher3.action.INSTALL_SHORTCUT";
     public static final String NEW_APPS_PAGE_KEY = "apps.new.page";
     public static final String NEW_APPS_LIST_KEY = "apps.new.list";
 
@@ -61,7 +61,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
 
     // A mime-type representing shortcut data
     public static final String SHORTCUT_MIMETYPE =
-            "com.android.launcher/shortcut";
+            "com.android.launcher3/shortcut";
 
     private static Object sLock = new Object();
 
diff --git a/src/com/android/launcher2/InstallWidgetReceiver.java b/src/com/android/launcher3/InstallWidgetReceiver.java
similarity index 94%
rename from src/com/android/launcher2/InstallWidgetReceiver.java
rename to src/com/android/launcher3/InstallWidgetReceiver.java
index a1e9b1187c..d802df2795 100644
--- a/src/com/android/launcher2/InstallWidgetReceiver.java
+++ b/src/com/android/launcher3/InstallWidgetReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 
 /**
@@ -42,18 +42,18 @@ import com.android.launcher.R;
  */
 public class InstallWidgetReceiver {
     public static final String ACTION_INSTALL_WIDGET =
-            "com.android.launcher.action.INSTALL_WIDGET";
+            "com.android.launcher3.action.INSTALL_WIDGET";
     public static final String ACTION_SUPPORTS_CLIPDATA_MIMETYPE =
-            "com.android.launcher.action.SUPPORTS_CLIPDATA_MIMETYPE";
+            "com.android.launcher3.action.SUPPORTS_CLIPDATA_MIMETYPE";
 
     // Currently not exposed.  Put into Intent when we want to make it public.
     // TEMP: Should we call this "EXTRA_APPWIDGET_PROVIDER"?
     public static final String EXTRA_APPWIDGET_COMPONENT =
-        "com.android.launcher.extra.widget.COMPONENT";
+        "com.android.launcher3.extra.widget.COMPONENT";
     public static final String EXTRA_APPWIDGET_CONFIGURATION_DATA_MIME_TYPE =
-        "com.android.launcher.extra.widget.CONFIGURATION_DATA_MIME_TYPE";
+        "com.android.launcher3.extra.widget.CONFIGURATION_DATA_MIME_TYPE";
     public static final String EXTRA_APPWIDGET_CONFIGURATION_DATA =
-        "com.android.launcher.extra.widget.CONFIGURATION_DATA";
+        "com.android.launcher3.extra.widget.CONFIGURATION_DATA";
 
     /**
      * A simple data class that contains per-item information that the adapter below can reference.
diff --git a/src/com/android/launcher2/InterruptibleInOutAnimator.java b/src/com/android/launcher3/InterruptibleInOutAnimator.java
similarity index 99%
rename from src/com/android/launcher2/InterruptibleInOutAnimator.java
rename to src/com/android/launcher3/InterruptibleInOutAnimator.java
index 375fddcb9c..2898b347dd 100644
--- a/src/com/android/launcher2/InterruptibleInOutAnimator.java
+++ b/src/com/android/launcher3/InterruptibleInOutAnimator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java
similarity index 99%
rename from src/com/android/launcher2/ItemInfo.java
rename to src/com/android/launcher3/ItemInfo.java
index 165c07b91a..fb41834239 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/android/launcher3/ItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.ContentValues;
 import android.content.Intent;
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher3/Launcher.java
similarity index 99%
rename from src/com/android/launcher2/Launcher.java
rename to src/com/android/launcher3/Launcher.java
index 94a0bca268..3f487cd213 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -63,7 +63,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.StrictMode;
 import android.os.SystemClock;
-import android.os.UserManager;
 import android.provider.Settings;
 import android.speech.RecognizerIntent;
 import android.text.Selection;
@@ -96,8 +95,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.common.Search;
-import com.android.launcher.R;
-import com.android.launcher2.DropTarget.DragObject;
+import com.android.launcher3.R;
+import com.android.launcher3.DropTarget.DragObject;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -156,7 +155,7 @@ public final class Launcher extends Activity
 
     // The Intent extra that defines whether to ignore the launch animation
     static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =
-            "com.android.launcher.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";
+            "com.android.launcher3.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";
 
     // Type: int
     private static final String RUNTIME_STATE_CURRENT_SCREEN = "launcher.current_screen";
@@ -181,11 +180,11 @@ public final class Launcher extends Activity
     // Type: parcelable
     private static final String RUNTIME_STATE_PENDING_ADD_WIDGET_INFO = "launcher.add_widget_info";
 
-    private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
+    private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher3.toolbar_icon";
     private static final String TOOLBAR_SEARCH_ICON_METADATA_NAME =
-            "com.android.launcher.toolbar_search_icon";
+            "com.android.launcher3.toolbar_search_icon";
     private static final String TOOLBAR_VOICE_SEARCH_ICON_METADATA_NAME =
-            "com.android.launcher.toolbar_voice_search_icon";
+            "com.android.launcher3.toolbar_voice_search_icon";
 
     /** The different states that Launcher can be in. */
     private enum State { NONE, WORKSPACE, APPS_CUSTOMIZE, APPS_CUSTOMIZE_SPRING_LOADED };
@@ -3863,16 +3862,16 @@ public final class Launcher extends Activity
 
         // Restricted secondary users (child mode) will potentially have very few apps
         // seeded when they start up for the first time. Clings won't work well with that
-        boolean supportsLimitedUsers =
-                android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
-        Account[] accounts = AccountManager.get(this).getAccounts();
-        if (supportsLimitedUsers && accounts.length == 0) {
-            UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
-            Bundle restrictions = um.getUserRestrictions();
-            if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) {
-               return false;
-            }
-        }
+//        boolean supportsLimitedUsers =
+//                android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
+//        Account[] accounts = AccountManager.get(this).getAccounts();
+//        if (supportsLimitedUsers && accounts.length == 0) {
+//            UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+//            Bundle restrictions = um.getUserRestrictions();
+//            if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) {
+//               return false;
+//            }
+//        }
         return true;
     }
 
@@ -3951,6 +3950,7 @@ public final class Launcher extends Activity
         boolean customCling = cling.getDrawIdentifier().equals("workspace_custom");
         if (customCling) {
             AccountManager am = AccountManager.get(this);
+            if (am == null) return false;
             Account[] accounts = am.getAccountsByType("com.google");
             return accounts.length == 0;
         }
@@ -4024,7 +4024,7 @@ public final class Launcher extends Activity
      * Prints out out state for debugging.
      */
     public void dumpState() {
-        Log.d(TAG, "BEGIN launcher2 dump state for launcher " + this);
+        Log.d(TAG, "BEGIN launcher3 dump state for launcher " + this);
         Log.d(TAG, "mSavedState=" + mSavedState);
         Log.d(TAG, "mWorkspaceLoading=" + mWorkspaceLoading);
         Log.d(TAG, "mRestoring=" + mRestoring);
@@ -4036,7 +4036,7 @@ public final class Launcher extends Activity
         if (mAppsCustomizeContent != null) {
             mAppsCustomizeContent.dumpState();
         }
-        Log.d(TAG, "END launcher2 dump state");
+        Log.d(TAG, "END launcher3 dump state");
     }
 
     @Override
diff --git a/src/com/android/launcher2/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java
similarity index 99%
rename from src/com/android/launcher2/LauncherAnimUtils.java
rename to src/com/android/launcher3/LauncherAnimUtils.java
index a89cb46541..01f72a7ce5 100644
--- a/src/com/android/launcher2/LauncherAnimUtils.java
+++ b/src/com/android/launcher3/LauncherAnimUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/com/android/launcher2/LauncherAnimatorUpdateListener.java b/src/com/android/launcher3/LauncherAnimatorUpdateListener.java
similarity index 97%
rename from src/com/android/launcher2/LauncherAnimatorUpdateListener.java
rename to src/com/android/launcher3/LauncherAnimatorUpdateListener.java
index dd821134df..ec9fd4d16e 100644
--- a/src/com/android/launcher2/LauncherAnimatorUpdateListener.java
+++ b/src/com/android/launcher3/LauncherAnimatorUpdateListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
diff --git a/src/com/android/launcher2/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
similarity index 98%
rename from src/com/android/launcher2/LauncherAppWidgetHost.java
rename to src/com/android/launcher3/LauncherAppWidgetHost.java
index 4d52ea8646..7b08d44038 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.appwidget.AppWidgetHost;
 import android.appwidget.AppWidgetHostView;
diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher3/LauncherAppWidgetHostView.java
similarity index 98%
rename from src/com/android/launcher2/LauncherAppWidgetHostView.java
rename to src/com/android/launcher3/LauncherAppWidgetHostView.java
index 549d3340e9..6157a87214 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHostView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.Context;
@@ -24,7 +24,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RemoteViews;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 /**
  * {@inheritDoc}
diff --git a/src/com/android/launcher2/LauncherAppWidgetInfo.java b/src/com/android/launcher3/LauncherAppWidgetInfo.java
similarity index 98%
rename from src/com/android/launcher2/LauncherAppWidgetInfo.java
rename to src/com/android/launcher3/LauncherAppWidgetInfo.java
index f001b2b64d..3fc67cb5f2 100644
--- a/src/com/android/launcher2/LauncherAppWidgetInfo.java
+++ b/src/com/android/launcher3/LauncherAppWidgetInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.appwidget.AppWidgetHostView;
 import android.content.ComponentName;
diff --git a/src/com/android/launcher2/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java
similarity index 98%
rename from src/com/android/launcher2/LauncherApplication.java
rename to src/com/android/launcher3/LauncherApplication.java
index e5f3250219..45e24255ef 100644
--- a/src/com/android/launcher2/LauncherApplication.java
+++ b/src/com/android/launcher3/LauncherApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.app.Application;
 import android.app.SearchManager;
@@ -26,7 +26,7 @@ import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.os.Handler;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.lang.ref.WeakReference;
 
@@ -37,7 +37,7 @@ public class LauncherApplication extends Application {
     private static boolean sIsScreenLarge;
     private static float sScreenDensity;
     private static int sLongPressTimeout = 300;
-    private static final String sSharedPreferencesKey = "com.android.launcher2.prefs";
+    private static final String sSharedPreferencesKey = "com.android.launcher3.prefs";
     WeakReference<LauncherProvider> mLauncherProvider;
 
     @Override
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
similarity index 99%
rename from src/com/android/launcher2/LauncherModel.java
rename to src/com/android/launcher3/LauncherModel.java
index 1d562beae3..5459af21b7 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.app.SearchManager;
 import android.appwidget.AppWidgetManager;
@@ -47,8 +47,8 @@ import android.os.RemoteException;
 import android.os.SystemClock;
 import android.util.Log;
 
-import com.android.launcher.R;
-import com.android.launcher2.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
+import com.android.launcher3.R;
+import com.android.launcher3.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
 
 import java.lang.ref.WeakReference;
 import java.net.URISyntaxException;
diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
similarity index 99%
rename from src/com/android/launcher2/LauncherProvider.java
rename to src/com/android/launcher3/LauncherProvider.java
index 8097ac99ef..fb12f71632 100644
--- a/src/com/android/launcher2/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.app.SearchManager;
 import android.appwidget.AppWidgetHost;
@@ -49,8 +49,8 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
 
-import com.android.launcher.R;
-import com.android.launcher2.LauncherSettings.Favorites;
+import com.android.launcher3.R;
+import com.android.launcher3.LauncherSettings.Favorites;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -68,7 +68,7 @@ public class LauncherProvider extends ContentProvider {
 
     private static final int DATABASE_VERSION = 12;
 
-    static final String AUTHORITY = "com.android.launcher2.settings";
+    static final String AUTHORITY = "com.android.launcher3.settings";
 
     static final String TABLE_FAVORITES = "favorites";
     static final String PARAMETER_NOTIFY = "notify";
@@ -78,7 +78,7 @@ public class LauncherProvider extends ContentProvider {
             "DEFAULT_WORKSPACE_RESOURCE_ID";
 
     private static final String ACTION_APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE =
-            "com.android.launcher.action.APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE";
+            "com.android.launcher3.action.APPWIDGET_DEFAULT_WORKSPACE_CONFIGURE";
 
     /**
      * {@link Uri} triggered at any registered {@link android.database.ContentObserver} when
@@ -441,7 +441,7 @@ public class LauncherProvider extends ContentProvider {
 
             // Where's version 5?
             // - Donut and sholes on 2.0 shipped with version 4 of launcher1.
-            // - Passion shipped on 2.1 with version 6 of launcher2
+            // - Passion shipped on 2.1 with version 6 of launcher3
             // - Sholes shipped on 2.1r1 (aka Mr. 3) with version 5 of launcher 1
             //   but version 5 on there was the updateContactsShortcuts change
             //   which was version 6 in launcher 2 (first shipped on passion 2.1r1).
diff --git a/src/com/android/launcher2/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
similarity index 99%
rename from src/com/android/launcher2/LauncherSettings.java
rename to src/com/android/launcher3/LauncherSettings.java
index ee003716bc..7d2b843d01 100644
--- a/src/com/android/launcher2/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher3/LauncherViewPropertyAnimator.java
similarity index 99%
rename from src/com/android/launcher2/LauncherViewPropertyAnimator.java
rename to src/com/android/launcher3/LauncherViewPropertyAnimator.java
index 258b2f4b94..8a9c35dda3 100644
--- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java
+++ b/src/com/android/launcher3/LauncherViewPropertyAnimator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
diff --git a/src/com/android/launcher2/PackageChangedReceiver.java b/src/com/android/launcher3/PackageChangedReceiver.java
similarity index 95%
rename from src/com/android/launcher2/PackageChangedReceiver.java
rename to src/com/android/launcher3/PackageChangedReceiver.java
index e5e7e94b28..ded01a6fc4 100644
--- a/src/com/android/launcher2/PackageChangedReceiver.java
+++ b/src/com/android/launcher3/PackageChangedReceiver.java
@@ -1,4 +1,4 @@
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher3/PagedView.java
similarity index 99%
rename from src/com/android/launcher2/PagedView.java
rename to src/com/android/launcher3/PagedView.java
index 494534c16a..8716a33be3 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -42,7 +42,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.Interpolator;
 import android.widget.Scroller;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/PagedViewCellLayout.java b/src/com/android/launcher3/PagedViewCellLayout.java
similarity index 99%
rename from src/com/android/launcher2/PagedViewCellLayout.java
rename to src/com/android/launcher3/PagedViewCellLayout.java
index 9ce177b76d..177425aca1 100644
--- a/src/com/android/launcher2/PagedViewCellLayout.java
+++ b/src/com/android/launcher3/PagedViewCellLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -24,7 +24,7 @@ import android.view.View;
 import android.view.ViewDebug;
 import android.view.ViewGroup;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 /**
  * An abstraction of the original CellLayout which supports laying out items
diff --git a/src/com/android/launcher2/PagedViewCellLayoutChildren.java b/src/com/android/launcher3/PagedViewCellLayoutChildren.java
similarity index 99%
rename from src/com/android/launcher2/PagedViewCellLayoutChildren.java
rename to src/com/android/launcher3/PagedViewCellLayoutChildren.java
index 187a22d556..c9e108d984 100644
--- a/src/com/android/launcher2/PagedViewCellLayoutChildren.java
+++ b/src/com/android/launcher3/PagedViewCellLayoutChildren.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/src/com/android/launcher2/PagedViewGridLayout.java b/src/com/android/launcher3/PagedViewGridLayout.java
similarity index 99%
rename from src/com/android/launcher2/PagedViewGridLayout.java
rename to src/com/android/launcher3/PagedViewGridLayout.java
index aa9adc0ea7..b28686113b 100644
--- a/src/com/android/launcher2/PagedViewGridLayout.java
+++ b/src/com/android/launcher3/PagedViewGridLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.view.MotionEvent;
diff --git a/src/com/android/launcher2/PagedViewIcon.java b/src/com/android/launcher3/PagedViewIcon.java
similarity index 98%
rename from src/com/android/launcher2/PagedViewIcon.java
rename to src/com/android/launcher3/PagedViewIcon.java
index d2aa31f86a..73f62d60e6 100644
--- a/src/com/android/launcher2/PagedViewIcon.java
+++ b/src/com/android/launcher3/PagedViewIcon.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/src/com/android/launcher2/PagedViewIconCache.java b/src/com/android/launcher3/PagedViewIconCache.java
similarity index 99%
rename from src/com/android/launcher2/PagedViewIconCache.java
rename to src/com/android/launcher3/PagedViewIconCache.java
index d65f68bafd..0d03b5a521 100644
--- a/src/com/android/launcher2/PagedViewIconCache.java
+++ b/src/com/android/launcher3/PagedViewIconCache.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher3/PagedViewWidget.java
similarity index 99%
rename from src/com/android/launcher2/PagedViewWidget.java
rename to src/com/android/launcher3/PagedViewWidget.java
index 86ab128cd0..bd40c5cf59 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher3/PagedViewWidget.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.Context;
@@ -29,7 +29,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 /**
  * The linear layout used strictly for the widget/wallpaper tab of the customization tray
diff --git a/src/com/android/launcher2/PagedViewWidgetImageView.java b/src/com/android/launcher3/PagedViewWidgetImageView.java
similarity index 97%
rename from src/com/android/launcher2/PagedViewWidgetImageView.java
rename to src/com/android/launcher3/PagedViewWidgetImageView.java
index 992817786a..71f5eead3e 100644
--- a/src/com/android/launcher2/PagedViewWidgetImageView.java
+++ b/src/com/android/launcher3/PagedViewWidgetImageView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/android/launcher2/PagedViewWithDraggableItems.java b/src/com/android/launcher3/PagedViewWithDraggableItems.java
similarity index 99%
rename from src/com/android/launcher2/PagedViewWithDraggableItems.java
rename to src/com/android/launcher3/PagedViewWithDraggableItems.java
index 9cdd74f242..8f10ecfa54 100644
--- a/src/com/android/launcher2/PagedViewWithDraggableItems.java
+++ b/src/com/android/launcher3/PagedViewWithDraggableItems.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/PendingAddItemInfo.java b/src/com/android/launcher3/PendingAddItemInfo.java
similarity index 99%
rename from src/com/android/launcher2/PendingAddItemInfo.java
rename to src/com/android/launcher3/PendingAddItemInfo.java
index a1e7b06a57..967cc928e1 100644
--- a/src/com/android/launcher2/PendingAddItemInfo.java
+++ b/src/com/android/launcher3/PendingAddItemInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.appwidget.AppWidgetHostView;
 import android.appwidget.AppWidgetProviderInfo;
diff --git a/src/com/android/launcher2/PreloadReceiver.java b/src/com/android/launcher3/PreloadReceiver.java
similarity index 93%
rename from src/com/android/launcher2/PreloadReceiver.java
rename to src/com/android/launcher3/PreloadReceiver.java
index 08350b6ff5..ee3434822e 100644
--- a/src/com/android/launcher2/PreloadReceiver.java
+++ b/src/com/android/launcher3/PreloadReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -27,7 +27,7 @@ public class PreloadReceiver extends BroadcastReceiver {
     private static final boolean LOGD = false;
 
     public static final String EXTRA_WORKSPACE_NAME =
-            "com.android.launcher.action.EXTRA_WORKSPACE_NAME";
+            "com.android.launcher3.action.EXTRA_WORKSPACE_NAME";
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -36,7 +36,7 @@ public class PreloadReceiver extends BroadcastReceiver {
         if (provider != null) {
             String name = intent.getStringExtra(EXTRA_WORKSPACE_NAME);
             final int workspaceResId = !TextUtils.isEmpty(name)
-                    ? context.getResources().getIdentifier(name, "xml", "com.android.launcher") : 0;
+                    ? context.getResources().getIdentifier(name, "xml", "com.android.launcher3") : 0;
             if (LOGD) {
                 Log.d(TAG, "workspace name: " + name + " id: " + workspaceResId);
             }
diff --git a/src/com/android/launcher2/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java
similarity index 99%
rename from src/com/android/launcher2/SearchDropTargetBar.java
rename to src/com/android/launcher3/SearchDropTargetBar.java
index a5b76c9bf7..32d094b05b 100644
--- a/src/com/android/launcher2/SearchDropTargetBar.java
+++ b/src/com/android/launcher3/SearchDropTargetBar.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -27,7 +27,7 @@ import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.FrameLayout;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 /*
  * Ths bar will manage the transition between the QSB search bar and the delete drop
diff --git a/src/com/android/launcher2/ShortcutAndWidgetContainer.java b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
similarity index 99%
rename from src/com/android/launcher2/ShortcutAndWidgetContainer.java
rename to src/com/android/launcher3/ShortcutAndWidgetContainer.java
index 36f135aff9..18b9399d1c 100644
--- a/src/com/android/launcher2/ShortcutAndWidgetContainer.java
+++ b/src/com/android/launcher3/ShortcutAndWidgetContainer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.app.WallpaperManager;
 import android.content.Context;
diff --git a/src/com/android/launcher2/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java
similarity index 99%
rename from src/com/android/launcher2/ShortcutInfo.java
rename to src/com/android/launcher3/ShortcutInfo.java
index ccb663a7fe..5249fec020 100644
--- a/src/com/android/launcher2/ShortcutInfo.java
+++ b/src/com/android/launcher3/ShortcutInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/launcher2/SmoothPagedView.java b/src/com/android/launcher3/SmoothPagedView.java
similarity index 99%
rename from src/com/android/launcher2/SmoothPagedView.java
rename to src/com/android/launcher3/SmoothPagedView.java
index 7e47f1a3f3..1beffacb51 100644
--- a/src/com/android/launcher2/SmoothPagedView.java
+++ b/src/com/android/launcher3/SmoothPagedView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/android/launcher2/SpringLoadedDragController.java b/src/com/android/launcher3/SpringLoadedDragController.java
similarity index 98%
rename from src/com/android/launcher2/SpringLoadedDragController.java
rename to src/com/android/launcher3/SpringLoadedDragController.java
index d96aab7941..45edaef861 100644
--- a/src/com/android/launcher2/SpringLoadedDragController.java
+++ b/src/com/android/launcher3/SpringLoadedDragController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 public class SpringLoadedDragController implements OnAlarmListener {
     // how long the user must hover over a mini-screen before it unshrinks
diff --git a/src/com/android/launcher2/UninstallShortcutReceiver.java b/src/com/android/launcher3/UninstallShortcutReceiver.java
similarity index 98%
rename from src/com/android/launcher2/UninstallShortcutReceiver.java
rename to src/com/android/launcher3/UninstallShortcutReceiver.java
index 02590c9f69..6bc289a5ec 100644
--- a/src/com/android/launcher2/UninstallShortcutReceiver.java
+++ b/src/com/android/launcher3/UninstallShortcutReceiver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -25,7 +25,7 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.widget.Toast;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -35,7 +35,7 @@ import java.util.Set;
 
 public class UninstallShortcutReceiver extends BroadcastReceiver {
     private static final String ACTION_UNINSTALL_SHORTCUT =
-            "com.android.launcher.action.UNINSTALL_SHORTCUT";
+            "com.android.launcher3.action.UNINSTALL_SHORTCUT";
 
     // The set of shortcuts that are pending uninstall
     private static ArrayList<PendingUninstallShortcutInfo> mUninstallQueue =
diff --git a/src/com/android/launcher2/UserInitializeReceiver.java b/src/com/android/launcher3/UserInitializeReceiver.java
similarity index 92%
rename from src/com/android/launcher2/UserInitializeReceiver.java
rename to src/com/android/launcher3/UserInitializeReceiver.java
index bf3330acca..5cd518190d 100644
--- a/src/com/android/launcher2/UserInitializeReceiver.java
+++ b/src/com/android/launcher3/UserInitializeReceiver.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.io.IOException;
 import java.util.ArrayList;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import android.app.WallpaperManager;
 import android.content.BroadcastReceiver;
@@ -36,8 +36,8 @@ public class UserInitializeReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         final Resources resources = context.getResources();
         // Context.getPackageName() may return the "original" package name,
-        // com.android.launcher2; Resources needs the real package name,
-        // com.android.launcher. So we ask Resources for what it thinks the
+        // com.android.launcher3; Resources needs the real package name,
+        // com.android.launcher3. So we ask Resources for what it thinks the
         // package name should be.
         final String packageName = resources.getResourcePackageName(R.array.wallpapers);
         ArrayList<Integer> list = new ArrayList<Integer>();
diff --git a/src/com/android/launcher2/Utilities.java b/src/com/android/launcher3/Utilities.java
similarity index 99%
rename from src/com/android/launcher2/Utilities.java
rename to src/com/android/launcher3/Utilities.java
index d3e4516420..0cc29faa32 100644
--- a/src/com/android/launcher2/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import java.util.Random;
 
@@ -34,7 +34,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.PaintDrawable;
 import android.util.DisplayMetrics;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 /**
  * Various utilities shared amongst the Launcher's classes.
diff --git a/src/com/android/launcher2/WallpaperChooser.java b/src/com/android/launcher3/WallpaperChooser.java
similarity index 96%
rename from src/com/android/launcher2/WallpaperChooser.java
rename to src/com/android/launcher3/WallpaperChooser.java
index 77e1e6ffb8..fe81ccbb56 100644
--- a/src/com/android/launcher2/WallpaperChooser.java
+++ b/src/com/android/launcher3/WallpaperChooser.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import android.app.Activity;
 import android.app.DialogFragment;
diff --git a/src/com/android/launcher2/WallpaperChooserDialogFragment.java b/src/com/android/launcher3/WallpaperChooserDialogFragment.java
similarity index 98%
rename from src/com/android/launcher2/WallpaperChooserDialogFragment.java
rename to src/com/android/launcher3/WallpaperChooserDialogFragment.java
index b99d8ecb3c..99de815f9a 100644
--- a/src/com/android/launcher2/WallpaperChooserDialogFragment.java
+++ b/src/com/android/launcher3/WallpaperChooserDialogFragment.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -41,7 +41,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.SpinnerAdapter;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -50,7 +50,7 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
         AdapterView.OnItemSelectedListener, AdapterView.OnItemClickListener {
 
     private static final String TAG = "Launcher.WallpaperChooserDialogFragment";
-    private static final String EMBEDDED_KEY = "com.android.launcher2."
+    private static final String EMBEDDED_KEY = "com.android.launcher3."
             + "WallpaperChooserDialogFragment.EMBEDDED_KEY";
 
     private boolean mEmbedded;
@@ -194,8 +194,8 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
 
         final Resources resources = getResources();
         // Context.getPackageName() may return the "original" package name,
-        // com.android.launcher2; Resources needs the real package name,
-        // com.android.launcher. So we ask Resources for what it thinks the
+        // com.android.launcher3; Resources needs the real package name,
+        // com.android.launcher3. So we ask Resources for what it thinks the
         // package name should be.
         final String packageName = resources.getResourcePackageName(R.array.wallpapers);
 
diff --git a/src/com/android/launcher2/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
similarity index 99%
rename from src/com/android/launcher2/WidgetPreviewLoader.java
rename to src/com/android/launcher3/WidgetPreviewLoader.java
index 41a8904a41..ddc478a204 100644
--- a/src/com/android/launcher2/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -1,4 +1,4 @@
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
@@ -25,7 +25,7 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import com.android.launcher.R;
+import com.android.launcher3.R;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher3/Workspace.java
similarity index 99%
rename from src/com/android/launcher2/Workspace.java
rename to src/com/android/launcher3/Workspace.java
index 24d5f88d45..4f1fb08096 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.launcher2;
+package com.android.launcher3;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
@@ -52,9 +52,9 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.launcher.R;
-import com.android.launcher2.FolderIcon.FolderRingAnimator;
-import com.android.launcher2.LauncherSettings.Favorites;
+import com.android.launcher3.R;
+import com.android.launcher3.FolderIcon.FolderRingAnimator;
+import com.android.launcher3.LauncherSettings.Favorites;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
diff --git a/tests/stress/AndroidManifest.xml b/tests/stress/AndroidManifest.xml
index 0df3a9da34..bcca1ff535 100644
--- a/tests/stress/AndroidManifest.xml
+++ b/tests/stress/AndroidManifest.xml
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher.stress.launcherrotation">
+    package="com.android.launcher3.stress.launcherrotation">
 
     <application>
         <uses-library android:name="android.test.runner" />
@@ -23,7 +23,7 @@
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.launcher"
+        android:targetPackage="com.android.launcher3"
         android:label="Rotation stress test using Launcher2">
     </instrumentation>
 </manifest>
diff --git a/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java b/tests/stress/src/com/android/launcher3/stress/LauncherRotationStressTest.java
similarity index 96%
rename from tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java
rename to tests/stress/src/com/android/launcher3/stress/LauncherRotationStressTest.java
index d21fd53ba0..a5b85eb19c 100644
--- a/tests/stress/src/com/android/launcher2/stress/LauncherRotationStressTest.java
+++ b/tests/stress/src/com/android/launcher3/stress/LauncherRotationStressTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.launcher2.stress;
+package com.android.launcher3.stress;
 
 
-import com.android.launcher2.Launcher;
+import com.android.launcher3.Launcher;
 
 import android.content.pm.ActivityInfo;
 import android.os.SystemClock;