From 325dc23624160689e59fbac708cf6f222b20d025 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Wed, 5 Jun 2013 22:57:57 -0400 Subject: [PATCH] Launcher2 is now Launcher3. Changes include - moving from com.android.launcher{,2} to com.android.launcher3 - removing wallpapers - new temporary icon Change-Id: I1eabd06059e94a8f3bdf6b620777bd1d2b7c212b --- Android.mk | 8 +-- AndroidManifest.xml | 54 +++++++++--------- proguard.flags | 14 ++--- res/drawable/wallpaper_gallery_background.xml | 2 +- res/layout-land/all_apps_cling.xml | 6 +- res/layout-land/application.xml | 2 +- .../apps_customize_application.xml | 4 +- res/layout-land/folder_cling.xml | 6 +- res/layout-land/folder_icon.xml | 6 +- res/layout-land/hotseat.xml | 8 +-- res/layout-land/launcher.xml | 14 ++--- res/layout-land/search_bar.xml | 4 +- res/layout-land/workspace_cling.xml | 6 +- res/layout-port/all_apps_cling.xml | 6 +- res/layout-port/application.xml | 2 +- .../apps_customize_application.xml | 4 +- res/layout-port/folder_cling.xml | 6 +- res/layout-port/folder_icon.xml | 6 +- res/layout-port/hotseat.xml | 8 +-- res/layout-port/launcher.xml | 12 ++-- res/layout-port/search_bar.xml | 10 ++-- res/layout-port/workspace_cling.xml | 6 +- res/layout-sw600dp-port/all_apps_cling.xml | 6 +- res/layout-sw600dp-port/folder_cling.xml | 6 +- res/layout-sw720dp-port/folder_cling.xml | 6 +- res/layout-sw720dp/all_apps_cling.xml | 6 +- res/layout-sw720dp/folder_cling.xml | 6 +- res/layout-sw720dp/hotseat.xml | 8 +-- res/layout-sw720dp/launcher.xml | 12 ++-- res/layout-sw720dp/search_bar.xml | 10 ++-- res/layout-sw720dp/wallpaper_item.xml | 2 +- res/layout-sw720dp/workspace.xml | 6 +- res/layout-sw720dp/workspace_cling.xml | 6 +- 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 +- res/mipmap-hdpi/ic_launcher_home.png | Bin 4048 -> 464 bytes res/mipmap-mdpi/ic_launcher_home.png | Bin 3116 -> 416 bytes res/mipmap-xhdpi/ic_launcher_home.png | Bin 7810 -> 443 bytes res/mipmap-xxhdpi/ic_launcher_home.png | Bin 0 -> 473 bytes res/values-sw720dp/wallpapers.xml | 11 ---- res/values/strings.xml | 2 +- res/values/wallpapers.xml | 12 ---- res/xml-sw600dp/default_workspace.xml | 2 +- res/xml-sw720dp/default_workspace.xml | 2 +- res/xml/default_workspace.xml | 2 +- res/xml/update_workspace.xml | 2 +- res/xml/wallpaper_picker_preview.xml | 2 +- .../AccessibleTabView.java | 2 +- .../{launcher2 => launcher3}/AddAdapter.java | 4 +- .../{launcher2 => launcher3}/Alarm.java | 2 +- .../{launcher2 => launcher3}/AllAppsList.java | 2 +- .../AppWidgetResizeFrame.java | 4 +- .../ApplicationInfo.java | 2 +- .../AppsCustomizePagedView.java | 6 +- .../AppsCustomizeTabHost.java | 4 +- .../BubbleTextView.java | 2 +- .../ButtonDropTarget.java | 4 +- .../{launcher2 => launcher3}/CellLayout.java | 6 +- .../CheckLongPressHelper.java | 2 +- .../{launcher2 => launcher3}/Cling.java | 4 +- .../DeferredHandler.java | 2 +- .../DeleteDropTarget.java | 4 +- .../DragController.java | 4 +- .../{launcher2 => launcher3}/DragLayer.java | 4 +- .../DragScroller.java | 2 +- .../{launcher2 => launcher3}/DragSource.java | 4 +- .../{launcher2 => launcher3}/DragView.java | 4 +- .../DrawableStateProxyView.java | 4 +- .../{launcher2 => launcher3}/DropTarget.java | 2 +- .../FastBitmapDrawable.java | 2 +- .../FirstFrameAnimatorHelper.java | 2 +- .../{launcher2 => launcher3}/FocusHelper.java | 4 +- .../FocusOnlyTabWidget.java | 2 +- .../{launcher2 => launcher3}/Folder.java | 6 +- .../FolderEditText.java | 2 +- .../{launcher2 => launcher3}/FolderIcon.java | 8 +-- .../{launcher2 => launcher3}/FolderInfo.java | 2 +- .../{launcher2 => launcher3}/HandleView.java | 4 +- .../HideFromAccessibilityHelper.java | 2 +- .../HolographicImageView.java | 2 +- .../HolographicLinearLayout.java | 4 +- .../HolographicOutlineHelper.java | 2 +- .../HolographicViewHelper.java | 2 +- .../{launcher2 => launcher3}/Hotseat.java | 4 +- .../{launcher2 => launcher3}/IconCache.java | 2 +- .../InfoDropTarget.java | 4 +- .../InstallShortcutReceiver.java | 8 +-- .../InstallWidgetReceiver.java | 14 ++--- .../InterruptibleInOutAnimator.java | 2 +- .../{launcher2 => launcher3}/ItemInfo.java | 2 +- .../{launcher2 => launcher3}/Launcher.java | 40 ++++++------- .../LauncherAnimUtils.java | 2 +- .../LauncherAnimatorUpdateListener.java | 2 +- .../LauncherAppWidgetHost.java | 2 +- .../LauncherAppWidgetHostView.java | 4 +- .../LauncherAppWidgetInfo.java | 2 +- .../LauncherApplication.java | 6 +- .../LauncherModel.java | 6 +- .../LauncherProvider.java | 12 ++-- .../LauncherSettings.java | 2 +- .../LauncherViewPropertyAnimator.java | 2 +- .../PackageChangedReceiver.java | 2 +- .../{launcher2 => launcher3}/PagedView.java | 4 +- .../PagedViewCellLayout.java | 4 +- .../PagedViewCellLayoutChildren.java | 2 +- .../PagedViewGridLayout.java | 2 +- .../PagedViewIcon.java | 2 +- .../PagedViewIconCache.java | 2 +- .../PagedViewWidget.java | 4 +- .../PagedViewWidgetImageView.java | 2 +- .../PagedViewWithDraggableItems.java | 2 +- .../PendingAddItemInfo.java | 2 +- .../PreloadReceiver.java | 6 +- .../SearchDropTargetBar.java | 4 +- .../ShortcutAndWidgetContainer.java | 2 +- .../ShortcutInfo.java | 2 +- .../SmoothPagedView.java | 2 +- .../SpringLoadedDragController.java | 2 +- .../UninstallShortcutReceiver.java | 6 +- .../UserInitializeReceiver.java | 8 +-- .../{launcher2 => launcher3}/Utilities.java | 4 +- .../WallpaperChooser.java | 4 +- .../WallpaperChooserDialogFragment.java | 10 ++-- .../WidgetPreviewLoader.java | 4 +- .../{launcher2 => launcher3}/Workspace.java | 8 +-- tests/stress/AndroidManifest.xml | 4 +- .../stress/LauncherRotationStressTest.java | 4 +- 134 files changed, 332 insertions(+), 357 deletions(-) create mode 100644 res/mipmap-xxhdpi/ic_launcher_home.png rename src/com/android/{launcher2 => launcher3}/AccessibleTabView.java (98%) rename src/com/android/{launcher2 => launcher3}/AddAdapter.java (97%) rename src/com/android/{launcher2 => launcher3}/Alarm.java (98%) rename src/com/android/{launcher2 => launcher3}/AllAppsList.java (99%) rename src/com/android/{launcher2 => launcher3}/AppWidgetResizeFrame.java (99%) rename src/com/android/{launcher2 => launcher3}/ApplicationInfo.java (99%) rename src/com/android/{launcher2 => launcher3}/AppsCustomizePagedView.java (99%) rename src/com/android/{launcher2 => launcher3}/AppsCustomizeTabHost.java (99%) rename src/com/android/{launcher2 => launcher3}/BubbleTextView.java (99%) rename src/com/android/{launcher2 => launcher3}/ButtonDropTarget.java (98%) rename src/com/android/{launcher2 => launcher3}/CellLayout.java (99%) rename src/com/android/{launcher2 => launcher3}/CheckLongPressHelper.java (98%) rename src/com/android/{launcher2 => launcher3}/Cling.java (99%) rename src/com/android/{launcher2 => launcher3}/DeferredHandler.java (99%) rename src/com/android/{launcher2 => launcher3}/DeleteDropTarget.java (99%) rename src/com/android/{launcher2 => launcher3}/DragController.java (99%) rename src/com/android/{launcher2 => launcher3}/DragLayer.java (99%) rename src/com/android/{launcher2 => launcher3}/DragScroller.java (97%) rename src/com/android/{launcher2 => launcher3}/DragSource.java (94%) rename src/com/android/{launcher2 => launcher3}/DragView.java (99%) rename src/com/android/{launcher2 => launcher3}/DrawableStateProxyView.java (96%) rename src/com/android/{launcher2 => launcher3}/DropTarget.java (99%) rename src/com/android/{launcher2 => launcher3}/FastBitmapDrawable.java (98%) rename src/com/android/{launcher2 => launcher3}/FirstFrameAnimatorHelper.java (99%) rename src/com/android/{launcher2 => launcher3}/FocusHelper.java (99%) rename src/com/android/{launcher2 => launcher3}/FocusOnlyTabWidget.java (98%) rename src/com/android/{launcher2 => launcher3}/Folder.java (99%) rename src/com/android/{launcher2 => launcher3}/FolderEditText.java (96%) rename src/com/android/{launcher2 => launcher3}/FolderIcon.java (99%) rename src/com/android/{launcher2 => launcher3}/FolderInfo.java (98%) rename src/com/android/{launcher2 => launcher3}/HandleView.java (97%) rename src/com/android/{launcher2 => launcher3}/HideFromAccessibilityHelper.java (99%) rename src/com/android/{launcher2 => launcher3}/HolographicImageView.java (98%) rename src/com/android/{launcher2 => launcher3}/HolographicLinearLayout.java (97%) rename src/com/android/{launcher2 => launcher3}/HolographicOutlineHelper.java (99%) rename src/com/android/{launcher2 => launcher3}/HolographicViewHelper.java (99%) rename src/com/android/{launcher2 => launcher3}/Hotseat.java (98%) rename src/com/android/{launcher2 => launcher3}/IconCache.java (99%) rename src/com/android/{launcher2 => launcher3}/InfoDropTarget.java (98%) rename src/com/android/{launcher2 => launcher3}/InstallShortcutReceiver.java (98%) rename src/com/android/{launcher2 => launcher3}/InstallWidgetReceiver.java (94%) rename src/com/android/{launcher2 => launcher3}/InterruptibleInOutAnimator.java (99%) rename src/com/android/{launcher2 => launcher3}/ItemInfo.java (99%) rename src/com/android/{launcher2 => launcher3}/Launcher.java (99%) rename src/com/android/{launcher2 => launcher3}/LauncherAnimUtils.java (99%) rename src/com/android/{launcher2 => launcher3}/LauncherAnimatorUpdateListener.java (97%) rename src/com/android/{launcher2 => launcher3}/LauncherAppWidgetHost.java (98%) rename src/com/android/{launcher2 => launcher3}/LauncherAppWidgetHostView.java (98%) rename src/com/android/{launcher2 => launcher3}/LauncherAppWidgetInfo.java (98%) rename src/com/android/{launcher2 => launcher3}/LauncherApplication.java (98%) rename src/com/android/{launcher2 => launcher3}/LauncherModel.java (99%) rename src/com/android/{launcher2 => launcher3}/LauncherProvider.java (99%) rename src/com/android/{launcher2 => launcher3}/LauncherSettings.java (99%) rename src/com/android/{launcher2 => launcher3}/LauncherViewPropertyAnimator.java (99%) rename src/com/android/{launcher2 => launcher3}/PackageChangedReceiver.java (95%) rename src/com/android/{launcher2 => launcher3}/PagedView.java (99%) rename src/com/android/{launcher2 => launcher3}/PagedViewCellLayout.java (99%) rename src/com/android/{launcher2 => launcher3}/PagedViewCellLayoutChildren.java (99%) rename src/com/android/{launcher2 => launcher3}/PagedViewGridLayout.java (99%) rename src/com/android/{launcher2 => launcher3}/PagedViewIcon.java (98%) rename src/com/android/{launcher2 => launcher3}/PagedViewIconCache.java (99%) rename src/com/android/{launcher2 => launcher3}/PagedViewWidget.java (99%) rename src/com/android/{launcher2 => launcher3}/PagedViewWidgetImageView.java (97%) rename src/com/android/{launcher2 => launcher3}/PagedViewWithDraggableItems.java (99%) rename src/com/android/{launcher2 => launcher3}/PendingAddItemInfo.java (99%) rename src/com/android/{launcher2 => launcher3}/PreloadReceiver.java (93%) rename src/com/android/{launcher2 => launcher3}/SearchDropTargetBar.java (99%) rename src/com/android/{launcher2 => launcher3}/ShortcutAndWidgetContainer.java (99%) rename src/com/android/{launcher2 => launcher3}/ShortcutInfo.java (99%) rename src/com/android/{launcher2 => launcher3}/SmoothPagedView.java (99%) rename src/com/android/{launcher2 => launcher3}/SpringLoadedDragController.java (98%) rename src/com/android/{launcher2 => launcher3}/UninstallShortcutReceiver.java (98%) rename src/com/android/{launcher2 => launcher3}/UserInitializeReceiver.java (92%) rename src/com/android/{launcher2 => launcher3}/Utilities.java (99%) rename src/com/android/{launcher2 => launcher3}/WallpaperChooser.java (96%) rename src/com/android/{launcher2 => launcher3}/WallpaperChooserDialogFragment.java (98%) rename src/com/android/{launcher2 => launcher3}/WidgetPreviewLoader.java (99%) rename src/com/android/{launcher2 => launcher3}/Workspace.java (99%) rename tests/stress/src/com/android/{launcher2 => launcher3}/stress/LauncherRotationStressTest.java (96%) 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 @@ --> - - + package="com.android.launcher3"> - - + + + android:name="com.android.launcher3.PreloadReceiver" + android:permission="com.android.launcher3.permission.PRELOAD_WORKSPACE"> - + + android:name="com.android.launcher3.InstallShortcutReceiver" + android:permission="com.android.launcher3.permission.INSTALL_SHORTCUT"> - + + android:name="com.android.launcher3.UninstallShortcutReceiver" + android:permission="com.android.launcher3.permission.UNINSTALL_SHORTCUT"> - + - + @@ -146,11 +144,11 @@ + android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS" + android:readPermission="com.android.launcher3.permission.READ_SETTINGS" /> 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 @@ - \ No newline at end of file + 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. --> - - + 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. --> - 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. --> - - - + 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. --> - - - + 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. --> - - - + 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 @@ - - - + - - - \ No newline at end of file + + 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"> - - - @@ -56,4 +56,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissWorkspaceCling" /> - + 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. --> - - + 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. --> - 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. --> - - - + 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. --> - - - + 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. --> - - - + 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 @@ - - - + - - + 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 @@ --> - - + - - + 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. --> - @@ -59,4 +59,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissWorkspaceCling" /> - + 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. --> - - + 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. --> - - + 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. --> - - + 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. --> - - + 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. --> - - + 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. --> - - - + 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 @@ - - - + - - + 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 @@ --> - - + - - + 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" /> - \ No newline at end of file + 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 @@ - - \ No newline at end of file + 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. --> - @@ -59,4 +59,4 @@ android:layout_marginEnd="10dp" android:layout_gravity="bottom|end" android:onClick="dismissWorkspaceCling" /> - + 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. --> - - - - + 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. --> - - - + 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. --> - @@ -29,4 +29,4 @@ android:gravity="start" android:layout_gravity="bottom|start" /> - + 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"> - - - \ No newline at end of file + 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. --> - @@ -30,4 +30,4 @@ - + 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. --> - 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. --> - - - - + 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 @@ - 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. --> - \ 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 8945ada3442d220887a91f255ee71683b9da5606..b556d7abad0f756b75d08503fa78b1f4db3c9899 100644 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI7SkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+g3lfkC`r&aOZkpoDaQ zPlzj!{tv_q4Ey)*|NsC083u;5nG6gw&lqog%6(8!87RS2666=mz)&{%tObzAnB?v5 z!qT5{GZ4sG<>}%W;&J@#<%68f4g#%-oHyEg)L2uRSYIexK2Kmz)aF>yD5G;*Qan|3 z^5wn-Kk~ZoKTI#2{NzSnnbN6i&R6nPRU9opf2|KQQ87Kk!N>;ZQ z8J_U(Yt!I4G+}C_BCpomy4|}CPP6bj`h8=PlfPR%O_cZL?-P+(e^|C|%I`n6rotnZ z@yZ+VMK5h#UA=v;b?E8+S-NJT*<1dsi#mhmdKI;Vst07T-P{Qv*} literal 4048 zcmV;>4=?bEP)$iWoOmNfTIF3FwWp?MsOU|WKlsk;z|o{c6P^Xd~8Ib z$U!RL&pG=?)h(*KtAXyW zZXM%EPO4H>_nvdV_xJhz&iS2FS7@#Ix(r>6uO;|epsxiQ%VPO&gb?H1wkWzuqQuQo zfX=^?e?M-;_s!N9bYpx$48Zj3t+(D<2k_EMFLeU4sH!5tzVe8PydV}3075`y@#4kv zT3cJUwzjrzz3sN!<^hrXcY*wG%_6HCzs~xmG!BS~BFpi`sQ`j)ZEb%W3WXl%>guuq zYHMrVbUOXBb?ess3djN(zyZ7>OVZz5NJ~E)q$OHFD!AkSOvqHV_2DH{Ep8wNs}~eIk)awDk1! z^y`D)r>d$dqS5HV0|yQ~_{uA8ID_MH+MD##*3~NL_Ko70q+z%vr6Jy1u)+8`pI)j9i>h zN|DWG0SE?z{XVyC+ehw=?c29M(%#)zZ>32q_^1nM?+N#fujM@ZyUv z0#H#=f!2Buat99{9CPHxLZBg$y8G_C+ai(3PrACg%yc^4udQSs))1gp^+S*!~OeTN%%rno78FJ+oXs9UFJZH|F)l$mqySlmx zNC_d3Qj$z2nK5GqD^{#v;>3w~o|hZFS{6r-9%b#?wd~omhe#xXX_{!Q3&_>h)?%9G z8{4;Ue`Npu{bfh4oC1|Z>c$&yoYT_M@^~VVXgPK2R6nG$*(_RXZoc_umM&e25CX?> z`bDuoAb{4I4I4JFY11Zz5Cnt4e#liFj!c0vdOfdEI29AV9xHSFEHmvA_YX_|#7XIU0?b#<7g`NobNJN~)7z5VcLksFOb zC6QXVaN)I+Cr^I7udi=PPfrh8>w-8wQn%c43rm(P!LqDEl&h<& z!?LU`@4WNQBm4L7A2xEs5vU|m3l=PxJ!#UUC*tw=8IfALbSbuNbEYZ9NFq!)9L9BB zHf-2%M&x3#*k^|iAAWH2=FPtu4sz!r(2!AT$&w|@!{P8h4n#_8O){CJv9Xc1wl?O> znL{?4Eg7ZCA(Cy|1cO1gZ{J=(E)t0p`cjNsDwX=h#*G`-pKFvmn?NOzy6m#cCS7yQ zHLG3Mo!`~fh2uCSk-Go>`GKoY2t@W5?3jA|NqfrhWI>eJtK3NjEKp;SEZ7sHK zZ`rY9$HO0d@WELJmS+;EBvLoraKr58=H@5j@%WVDfuD~QP>51KQsa?`^ZV~3=SMkz z(p&tS>gsA@vDjxF9UTw8{`%`@M6Q%T{+0MvW9L(z;oEP&{oZgm{L^Bj2F|70+S-^m zZyu>sYD|ziSLDLsFk827EetFN&gF`b`}qqmyzn1+k>EXIKY2MSRx5{V2-pVZgaV_DW4yLaz? z=)L#e8-!dbfqbljKxqE_`Pa6zwEV2EukV8H?(Q?rrN$Gf;UagYxm-<64V9IZpB_AT z@PRE`w!EDeDVrBa4iw1p#Q`c8ELgC`G|h{W$>g9Y4(&p zaTA2&IJmCMcfRu-T3TBAA?MHK5{U#-%8+GQ^`7TBd0*rfM(?Er0%BTg!xyJG<9Ej$ zcMu2!=OLPF2P{X@4o@WfX@6F$tWdI zA+&3)gFb#fQp=YwXYSm&q*5t-?24KHvX^8siDg;bbI(0oeDTEtGnOKM&32Ivg9Iv$ zVz%qLB9qB5efo4(tXR7A^M$cMnQ%WfoEn38?RjX)fYNDs72c=ZOxs9}fAl}!*o_DulTY(JMtmzA8+BZY2QX`RW_tk zsT7uFv258g8XFtgwQJWPaY_kPD6OrnWV2bMlw}UTl3*arylZ~U-VgqVn#vYF`eYv+ z$NxYon_CVF2dijqyo5_Hn9jSu-@|who%xD75TLc9+#5WK z7c5I@VGZ$x=EqO~-}3J- zFX85EALY{4D@bK}%PLaQHHuP(Vx8^4@(H8~Rm5ojU>CpM`FAv5o}s3u8l^PS1&s#3 zEs^VGzz8vMQiQJXCp`bwy)0HwF|GBRq_c^!5U6y-Jr{w>5jjjVz|mtJyt?;cCVwkK zWw?g#P5c!t!5@*%#?gv?HI+B8vP9H#F#zjq ze2#YP;g7ZrY~E^rj>zQCnNZn4ywl~4|JzK;{t&atMk`%xY#74k_aDB`0VhMU-l3|l zip2Q`c&q(6Zkqd3AX}Ec`Pcb{T96@3j(2u&)Om~AhANzl#tsQO>}SbD+p&xgO3|;{ zMu=48cXR|d5)2zS8BKj-H658ZInnhwLYQBy1r?j{NQ!A%n1+dz9+nZ{(24!1ieo4l zLCM@5YiO!OYjE5WYh)6lF`LQ>HcC231%|276~{Sz;(h9>zlT;5)3lIEBBeKCA9N-Q z8WSfSu!E#iS-MUgp{}-pP%wyH;n7$>i3yPj=n;}33^40@F@r9a86cTT($#gC>gqbe z;R+l#TXrX1c7bd=!10qu`1PBQax$}@iP0-r{QcEjc;0Lp`YtPE_D1Y4>J_od2^{M@ z%!^wd;aGAXbrs*>udiE8U0oxt>x_>;=W_7i(Um|bn>~NpM6h)qvoCDo(?9Oy!$VuK zjR>3G`6ntXt46*lML=I)54X(v7c$-{jFz3uZf)YTPv2$Vr?2pXn)}h(VK@zpvkwwD zu7eqgQ(s$!n-PPWhBP*A4G^nqNouHWC(~SU80tWlZsOti{NGibqz7hQ*m6^ z$xEZh-Up4uf;0*vKb4TKLTZgtU>GJ^f^-F*dwM)LY`jG799n1$!$c{No<@55bW|JW zzNt}-gGSNR{`Q!`uoq?qNPB5GV=C z$i3#eteJQBS?#!5 z(CCKld9%+Wrmb9`%Vj}+l~Na~R%4SJFZ(#?G-7!R@;hHf9|ZYHaFG@H)|2b69;QX= z@fApERq#Pl=A5e5c?^^ur9ioJC`tdSiu?N|7s!)d&dIBs1C-Lud4@6~CZ$_wLn?)o zUjDoC3RLFVyuz|<&abS7n+x*l0KK{lIaV(leZ zrddermup5}b_>e53BEb`M+71sN0WPKo;ZtXjo)YY$Iqjb&Z98WyiyLOjMK-J7c52v zJL%|qhw~bz^A~kLB;zE8Z}Fp)c%r1!4ruaNajb&?dv5u?n=1c+w+i zMo`)#osJjU80k{@xFa?Y34pAdq_uGl-C`HVotbDhH{3!b zVa~TEqo|hLf%Ru9PO(U;NUT9my83_eGj}(jsxzJd0000He@+yIW!D$S;_Ip=|P53m}g%$=lt9 zr9b0lAdpk#>Eak-ar*9sgS-t2Jgtc`jiUFs)*Rqkb3rtsabvC_i)i=P2d(9Q_AgPi z*nY2}pFv|0qrjoXCLikF7&1kBnOW@W5R6)%)OgR8=fGTxiwaU#oL%l1zgLm^kbnK$ zByUZo8O*^wj@K6K&tjS$9LBKKevC63f2bd|PQ1&=smBt`Q|Ei6yC4 z$wjF^iowXh&{)^NOxM6P#L(Qzz|hLbLf62=%D|xc^wd)*8glbfGSez?Yxp!xw+yI( N!PC{xWt~$(69Cm3gkk^y literal 3116 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 diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png index 7bef13ca732cb2ea9f7c71dce648364f706e1c14..46ec2b7753a0a3b4528d0d970a435a761434a4f4 100644 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3mUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC?Or- z6XFV_L54Cg?BBot|NsAI7#PxKGBC_MW4!fghdkpGpafG%kY6wZL)qlB7C;_jlDE4H zOMk}AKp2)G9792CoF6w3jVI=34isymh}-IMa}SnGS84#%Y` zo>d;fHyn-^G|rcLW%^TY&6Vz-ZmgT$hzPBC-kH!?7RSN$;_T<=%?vi%r@6nhRJhz& zlpy`dSp4;*mkj@_PS5EqcGqa^^5Ky9DXwD=^rB6sAacr$AEI&>(+Dl*nL6mmFB zQYmFJ6<%*pT{bZr=s?vH*NBpo#FA92Jdg>_@4Y~O#nQ4`{HGG<;TL#p?;OXk;vd$@?2>`LBkC*@e literal 7810 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 VYxp!xw+yI(!PC{xWt~$(69E5enq2?@ literal 0 HcmV?d00001 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 @@ - wallpaper_00 - wallpaper_01 - wallpaper_02 - wallpaper_03 - wallpaper_04 - wallpaper_05 - wallpaper_06 - wallpaper_07 - wallpaper_08 - wallpaper_09 - wallpaper_10 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 @@ - Launcher + Launcher3 Home 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 @@ - wallpaper_01 - wallpaper_02 - wallpaper_03 - wallpaper_04 - wallpaper_05 - wallpaper_06 - wallpaper_07 - wallpaper_08 - wallpaper_09 - wallpaper_10 - wallpaper_11 - wallpaper_12 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. --> - + 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. --> - + 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. --> - + 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. --> - + 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 @@ - \ No newline at end of file + 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 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 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 list = new ArrayList(); 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 @@ --> + package="com.android.launcher3.stress.launcherrotation"> @@ -23,7 +23,7 @@ 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;