diff options
| author | Tyson Miller <tmiller@cyngn.com> | 2015-11-10 08:59:15 -0800 |
|---|---|---|
| committer | Tyson Miller <tmiller@cyngn.com> | 2015-12-01 17:16:59 -0800 |
| commit | 719deb83a0ac84422b68605f4d5c782865766aef (patch) | |
| tree | fd3db92c9e10fa1665c2bb5c7f2e0b059ba79d5d /src/com/android/launcher3/FolderIcon.java | |
| parent | b0bc788a4fc3d6d7a86ff3f286d8524e3fa2787c (diff) | |
| download | android_packages_apps_Trebuchet-719deb83a0ac84422b68605f4d5c782865766aef.tar.gz android_packages_apps_Trebuchet-719deb83a0ac84422b68605f4d5c782865766aef.tar.bz2 android_packages_apps_Trebuchet-719deb83a0ac84422b68605f4d5c782865766aef.zip | |
Trebuchet: dynamic folder type added
Issue-Id: CYNGNOS-1328
Change-Id: I09bf7bec119307f54836fedee8a1532627035d9a
Diffstat (limited to 'src/com/android/launcher3/FolderIcon.java')
| -rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 214ec3241..b66d5b70d 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -170,12 +170,19 @@ public class FolderIcon extends FrameLayout implements FolderListener { icon.mLauncher = launcher; icon.setContentDescription(String.format(launcher.getString(R.string.folder_name_format), folderInfo.title)); - Folder folder = Folder.fromXml(launcher); - folder.setDragController(launcher.getDragController()); - folder.setFolderIcon(icon); - folder.bind(folderInfo); - icon.mFolder = folder; - + if (folderInfo.subType == FolderInfo.REMOTE_SUBTYPE) { + RemoteFolder folder = RemoteFolder.fromXml(launcher); + folder.setDragController(launcher.getDragController()); + folder.setFolderIcon(icon); + folder.bind(folderInfo); + icon.mFolder = folder; + } else { + Folder folder = Folder.fromXml(launcher); + folder.setDragController(launcher.getDragController()); + folder.setFolderIcon(icon); + folder.bind(folderInfo); + icon.mFolder = folder; + } icon.mFolderRingAnimator = new FolderRingAnimator(launcher, icon); folderInfo.addListener(icon); |