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/Hotseat.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/Hotseat.java')
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 2d3adf64d..ccdc56bc2 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -105,7 +105,7 @@ public class Hotseat extends FrameLayout { } void addAllAppsFolder(IconCache iconCache, - ArrayList<ApplicationInfo> allApps, ArrayList<ComponentName> onWorkspace, + ArrayList<AppInfo> allApps, ArrayList<ComponentName> onWorkspace, Launcher launcher, Workspace workspace) { FolderInfo fi = new FolderInfo(); @@ -124,7 +124,7 @@ public class Hotseat extends FrameLayout { workspace.addInScreen(folder, fi.container, fi.screenId, fi.cellX, fi.cellY, fi.spanX, fi.spanY); - for (ApplicationInfo info: allApps) { + for (AppInfo info: allApps) { ComponentName cn = info.intent.getComponent(); if (!onWorkspace.contains(cn)) { Log.d(TAG, "Adding to 'more apps': " + info.intent); @@ -134,7 +134,7 @@ public class Hotseat extends FrameLayout { } } - void addAppsToAllAppsFolder(ArrayList<ApplicationInfo> apps) { + void addAppsToAllAppsFolder(ArrayList<AppInfo> apps) { View v = mContent.getChildAt(getCellXFromOrder(mAllAppsButtonRank), getCellYFromOrder(mAllAppsButtonRank)); FolderIcon fi = null; @@ -145,7 +145,7 @@ public class Hotseat extends FrameLayout { } FolderInfo info = fi.getFolderInfo(); - for (ApplicationInfo a: apps) { + for (AppInfo a: apps) { ShortcutInfo si = a.makeShortcut(); info.add(si); } |