From 325dc23624160689e59fbac708cf6f222b20d025 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Wed, 5 Jun 2013 22:57:57 -0400
Subject: Launcher2 is now Launcher3.

Changes include
  - moving from com.android.launcher{,2} to
    com.android.launcher3
  - removing wallpapers
  - new temporary icon

Change-Id: I1eabd06059e94a8f3bdf6b620777bd1d2b7c212b
---
 res/layout/apps_customize_pane.xml    | 10 +++++-----
 res/layout/apps_customize_widget.xml  |  8 ++++----
 res/layout/custom_workspace_cling.xml |  6 +++---
 res/layout/drop_target_bar.xml        |  6 +++---
 res/layout/qsb_bar.xml                |  4 ++--
 res/layout/tab_widget_indicator.xml   |  2 +-
 res/layout/user_folder.xml            | 10 +++++-----
 res/layout/wallpaper_chooser_base.xml |  2 +-
 res/layout/workspace_screen.xml       |  6 +++---
 9 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index a9d7deded..a67cf919a 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 6bb794345..ad677e928 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 b3e15f589..3744f2e4b 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 ca3f55404..f38a50014 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 322dc006f..56e052346 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 df43d3ddd..de7c50ec4 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 aa4eb1c9c..8c72dd673 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 fa8ea9372..14906674e 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 6538532c1..acc9f6651 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" />
-- 
cgit v1.2.3