diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-04 00:45:37 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-04 16:21:20 +0200 |
commit | eadbfc564d84aaf1d800da3d0d6edf6312f89648 (patch) | |
tree | 8bb3858af8f7e2d7bbcf8ccff4b8904856d1c376 /src/com/android/launcher3/Workspace.java | |
parent | 8b3cd79082043a08c319f1550679d4078b7d509c (diff) | |
download | android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.tar.gz android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.tar.bz2 android_packages_apps_Trebuchet-eadbfc564d84aaf1d800da3d0d6edf6312f89648.zip |
Move wallpapers to external activity
Also renaming Launcher's ApplicationInfo to
AppInfo since ApplicationInfo is already a
framework class
Change-Id: Ib3e91d2ba4ace458d790a26c0ce850870fd3f146
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 339f0abe6..01a8adf77 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -3246,9 +3246,9 @@ public class Workspace extends SmoothPagedView switch (info.itemType) { case LauncherSettings.Favorites.ITEM_TYPE_APPLICATION: case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT: - if (info.container == NO_ID && info instanceof ApplicationInfo) { + if (info.container == NO_ID && info instanceof AppInfo) { // Came from all apps -- make a copy - info = new ShortcutInfo((ApplicationInfo) info); + info = new ShortcutInfo((AppInfo) info); } view = mLauncher.createShortcut(R.layout.application, cellLayout, (ShortcutInfo) info); @@ -3943,10 +3943,10 @@ public class Workspace extends SmoothPagedView // Removes items that match the application info specified, when applications are removed // as a part of an update, this is called to ensure that other widgets and application // shortcuts are not removed. - void removeItemsByApplicationInfo(final ArrayList<ApplicationInfo> appInfos) { + void removeItemsByApplicationInfo(final ArrayList<AppInfo> appInfos) { // Just create a hash table of all the specific components that this will affect HashSet<ComponentName> cns = new HashSet<ComponentName>(); - for (ApplicationInfo info : appInfos) { + for (AppInfo info : appInfos) { cns.add(info.componentName); } @@ -4024,7 +4024,7 @@ public class Workspace extends SmoothPagedView stripEmptyScreens(); } - void updateShortcuts(ArrayList<ApplicationInfo> apps) { + void updateShortcuts(ArrayList<AppInfo> apps) { ArrayList<ShortcutAndWidgetContainer> childrenLayouts = getAllShortcutAndWidgetContainers(); for (ShortcutAndWidgetContainer layout: childrenLayouts) { int childCount = layout.getChildCount(); @@ -4039,7 +4039,7 @@ public class Workspace extends SmoothPagedView final ComponentName name = intent.getComponent(); final int appCount = apps.size(); for (int k = 0; k < appCount; k++) { - ApplicationInfo app = apps.get(k); + AppInfo app = apps.get(k); if (app.componentName.equals(name)) { BubbleTextView shortcut = (BubbleTextView) view; info.updateIcon(mIconCache); |