diff options
author | Joe Onorato <joeo@android.com> | 2009-07-30 13:37:37 -0700 |
---|---|---|
committer | Joe Onorato <joeo@android.com> | 2009-07-30 13:37:37 -0700 |
commit | a5902524d4403885eb4c50360bf3465c6be796ef (patch) | |
tree | 230ccdd3b32e39d7691ead6f5e3654af66283273 /res | |
parent | fca7c88f9dba895d9f6cf52c6f0e656445063e3e (diff) | |
download | android_packages_apps_Trebuchet-a5902524d4403885eb4c50360bf3465c6be796ef.tar.gz android_packages_apps_Trebuchet-a5902524d4403885eb4c50360bf3465c6be796ef.tar.bz2 android_packages_apps_Trebuchet-a5902524d4403885eb4c50360bf3465c6be796ef.zip |
Launcher2 compiles.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/application.xml | 2 | ||||
-rw-r--r-- | res/layout-land/folder_icon.xml | 2 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 16 | ||||
-rw-r--r-- | res/layout-land/live_folder_grid.xml | 4 | ||||
-rw-r--r-- | res/layout-land/live_folder_icon.xml | 2 | ||||
-rw-r--r-- | res/layout-land/user_folder.xml | 4 | ||||
-rw-r--r-- | res/layout-land/workspace_screen.xml | 4 | ||||
-rw-r--r-- | res/layout-port/application.xml | 2 | ||||
-rw-r--r-- | res/layout-port/folder_icon.xml | 2 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 16 | ||||
-rw-r--r-- | res/layout-port/live_folder_grid.xml | 4 | ||||
-rw-r--r-- | res/layout-port/live_folder_icon.xml | 2 | ||||
-rw-r--r-- | res/layout-port/user_folder.xml | 4 | ||||
-rw-r--r-- | res/layout-port/workspace_screen.xml | 4 | ||||
-rw-r--r-- | res/layout/application_list.xml | 2 | ||||
-rw-r--r-- | res/layout/live_folder_list.xml | 4 | ||||
-rw-r--r-- | res/layout/widget_search.xml | 6 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/xml/default_workspace.xml | 2 |
19 files changed, 42 insertions, 42 deletions
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml index 52a1a37ea..6de565878 100644 --- a/res/layout-land/application.xml +++ b/res/layout-land/application.xml @@ -14,5 +14,5 @@ limitations under the License. --> -<com.android.launcher.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Landscape" /> diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml index ce4aade8b..c76a75666 100644 --- a/res/layout-land/folder_icon.xml +++ b/res/layout-land/folder_icon.xml @@ -14,5 +14,5 @@ limitations under the License. --> -<com.android.launcher.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Landscape" /> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 8214863f7..3af51ec55 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -14,16 +14,16 @@ limitations under the License. --> -<com.android.launcher.DragLayer +<com.android.launcher2.DragLayer xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" android:id="@+id/drag_layer" android:layout_width="fill_parent" android:layout_height="fill_parent"> <!-- The workspace contains 3 screens of cells --> - <com.android.launcher.Workspace + <com.android.launcher2.Workspace android:id="@+id/workspace" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -34,7 +34,7 @@ <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> <include android:id="@+id/cell3" layout="@layout/workspace_screen" /> - </com.android.launcher.Workspace> + </com.android.launcher2.Workspace> <SlidingDrawer android:id="@+id/drawer" @@ -46,7 +46,7 @@ android:handle="@+id/all_apps" android:content="@+id/content"> - <com.android.launcher.HandleView + <com.android.launcher2.HandleView android:id="@id/all_apps" android:layout_width="56dip" android:layout_height="fill_parent" @@ -61,7 +61,7 @@ launcher:direction="vertical" /> - <com.android.launcher.AllAppsGridView + <com.android.launcher2.AllAppsGridView android:id="@id/content" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -82,7 +82,7 @@ </SlidingDrawer> - <com.android.launcher.DeleteZone + <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:layout_width="49dip" android:layout_height="wrap_content" @@ -97,4 +97,4 @@ launcher:direction="vertical" /> -</com.android.launcher.DragLayer> +</com.android.launcher2.DragLayer> diff --git a/res/layout-land/live_folder_grid.xml b/res/layout-land/live_folder_grid.xml index bb623b0f6..8905cf330 100644 --- a/res/layout-land/live_folder_grid.xml +++ b/res/layout-land/live_folder_grid.xml @@ -17,7 +17,7 @@ */ --> -<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <Button @@ -47,4 +47,4 @@ android:verticalSpacing="10dip" android:numColumns="5" /> -</com.android.launcher.LiveFolder> +</com.android.launcher2.LiveFolder> diff --git a/res/layout-land/live_folder_icon.xml b/res/layout-land/live_folder_icon.xml index 7b6d58dad..64c2d444c 100644 --- a/res/layout-land/live_folder_icon.xml +++ b/res/layout-land/live_folder_icon.xml @@ -17,5 +17,5 @@ */ --> -<com.android.launcher.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Landscape" /> diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml index fbf337bdd..b27c94b08 100644 --- a/res/layout-land/user_folder.xml +++ b/res/layout-land/user_folder.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.launcher.UserFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.UserFolder xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <Button @@ -44,4 +44,4 @@ android:verticalSpacing="10dip" android:numColumns="5" /> -</com.android.launcher.UserFolder> +</com.android.launcher2.UserFolder> diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml index 62e59b9ab..5207d7b9c 100644 --- a/res/layout-land/workspace_screen.xml +++ b/res/layout-land/workspace_screen.xml @@ -14,9 +14,9 @@ limitations under the License. --> -<com.android.launcher.CellLayout +<com.android.launcher2.CellLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/res/layout-port/application.xml b/res/layout-port/application.xml index b984258d2..f904a661f 100644 --- a/res/layout-port/application.xml +++ b/res/layout-port/application.xml @@ -14,5 +14,5 @@ limitations under the License. --> -<com.android.launcher.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Portrait" /> diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml index 1d5037094..49049cfaf 100644 --- a/res/layout-port/folder_icon.xml +++ b/res/layout-port/folder_icon.xml @@ -14,5 +14,5 @@ limitations under the License. --> -<com.android.launcher.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.FolderIcon xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Portrait" /> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 7dcacd6dd..6ed605b00 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -14,16 +14,16 @@ limitations under the License. --> -<com.android.launcher.DragLayer +<com.android.launcher2.DragLayer xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" android:id="@+id/drag_layer" android:layout_width="fill_parent" android:layout_height="fill_parent"> <!-- The workspace contains 3 screens of cells --> - <com.android.launcher.Workspace + <com.android.launcher2.Workspace android:id="@+id/workspace" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -34,7 +34,7 @@ <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> <include android:id="@+id/cell3" layout="@layout/workspace_screen" /> - </com.android.launcher.Workspace> + </com.android.launcher2.Workspace> <SlidingDrawer android:id="@+id/drawer" @@ -46,7 +46,7 @@ android:handle="@+id/all_apps" android:content="@+id/content"> - <com.android.launcher.HandleView + <com.android.launcher2.HandleView android:id="@id/all_apps" android:layout_width="fill_parent" android:layout_height="56dip" @@ -61,7 +61,7 @@ launcher:direction="horizontal" /> - <com.android.launcher.AllAppsGridView + <com.android.launcher2.AllAppsGridView android:id="@id/content" android:layout_width="fill_parent" android:layout_height="fill_parent" @@ -82,7 +82,7 @@ </SlidingDrawer> - <com.android.launcher.DeleteZone + <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:layout_width="wrap_content" android:layout_height="49dip" @@ -96,4 +96,4 @@ launcher:direction="horizontal" /> -</com.android.launcher.DragLayer> +</com.android.launcher2.DragLayer> diff --git a/res/layout-port/live_folder_grid.xml b/res/layout-port/live_folder_grid.xml index e5bcafe54..1f82216ff 100644 --- a/res/layout-port/live_folder_grid.xml +++ b/res/layout-port/live_folder_grid.xml @@ -17,7 +17,7 @@ */ --> -<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <Button @@ -47,4 +47,4 @@ android:verticalSpacing="10dip" android:numColumns="4" /> -</com.android.launcher.LiveFolder> +</com.android.launcher2.LiveFolder> diff --git a/res/layout-port/live_folder_icon.xml b/res/layout-port/live_folder_icon.xml index dc711f3cf..e3cd49e34 100644 --- a/res/layout-port/live_folder_icon.xml +++ b/res/layout-port/live_folder_icon.xml @@ -17,5 +17,5 @@ */ --> -<com.android.launcher.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.LiveFolderIcon xmlns:android="http://schemas.android.com/apk/res/android" style="@style/WorkspaceIcon.Portrait" /> diff --git a/res/layout-port/user_folder.xml b/res/layout-port/user_folder.xml index 27d70fc7a..3d0dfb7fc 100644 --- a/res/layout-port/user_folder.xml +++ b/res/layout-port/user_folder.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<com.android.launcher.UserFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.UserFolder xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <Button @@ -44,4 +44,4 @@ android:verticalSpacing="10dip" android:numColumns="4" /> -</com.android.launcher.UserFolder> +</com.android.launcher2.UserFolder> diff --git a/res/layout-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml index c6d419b95..6bbf6e951 100644 --- a/res/layout-port/workspace_screen.xml +++ b/res/layout-port/workspace_screen.xml @@ -14,9 +14,9 @@ limitations under the License. --> -<com.android.launcher.CellLayout +<com.android.launcher2.CellLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/res/layout/application_list.xml b/res/layout/application_list.xml index 230a95197..39639ba86 100644 --- a/res/layout/application_list.xml +++ b/res/layout/application_list.xml @@ -67,4 +67,4 @@ </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/live_folder_list.xml b/res/layout/live_folder_list.xml index f96a19094..00f191e3f 100644 --- a/res/layout/live_folder_list.xml +++ b/res/layout/live_folder_list.xml @@ -17,7 +17,7 @@ */ --> -<com.android.launcher.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher2.LiveFolder xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical"> <Button @@ -39,4 +39,4 @@ android:cacheColorHint="#ff333333" android:background="@drawable/box_launcher_bottom" /> -</com.android.launcher.LiveFolder> +</com.android.launcher2.LiveFolder> diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml index a83e675ee..3aee913e9 100644 --- a/res/layout/widget_search.xml +++ b/res/layout/widget_search.xml @@ -14,9 +14,9 @@ limitations under the License. --> -<com.android.launcher.Search +<com.android.launcher2.Search xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2" android:id="@+id/widget_search" android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -58,4 +58,4 @@ </LinearLayout> -</com.android.launcher.Search> +</com.android.launcher2.Search> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2796171b5..f971f7cae 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,7 +21,7 @@ <!-- General --> <skip /> <!-- Application name --> - <string name="application_name">Home</string> + <string name="application_name">Launcher2</string> <!-- Name for all applications running as this uid. --> <string name="uid_name">Android Core Apps</string> <!-- Default folder name --> diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index 60bfe8294..da983d006 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> +<favorites xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher2"> <search launcher:screen="1" |