summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-07-20 10:09:42 -0700
committerSunny Goyal <sunnygoyal@google.com>2017-07-25 14:30:54 -0700
commite29897f503d54866fac279aa366922219d60b834 (patch)
tree91cac889ec300d4310b91e54e8cd985b4b9395cd /src/com/android/launcher3/Launcher.java
parent4560d2f731f3e0a5c377a7dc5824ee66a58b3e04 (diff)
downloadandroid_packages_apps_Trebuchet-e29897f503d54866fac279aa366922219d60b834.tar.gz
android_packages_apps_Trebuchet-e29897f503d54866fac279aa366922219d60b834.tar.bz2
android_packages_apps_Trebuchet-e29897f503d54866fac279aa366922219d60b834.zip
Adding spring effect for folder icons when dragging similar to adaptive icons
Bug: 63889144 Change-Id: Idd1fd13c6343bf3e0a3a0e5ff0be730d41996575
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 97f1ead86..4b3148626 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1465,23 +1465,25 @@ public class Launcher extends BaseActivity
mWorkspace.addInScreen(view, info);
} else {
// Adding a shortcut to a Folder.
- final long folderIconId = container;
- FolderIcon folderIcon = (FolderIcon) mWorkspace.getFirstMatch(new ItemOperator() {
- @Override
- public boolean evaluate(ItemInfo info, View view) {
- return info != null && info.id == folderIconId;
- }
- });
-
+ FolderIcon folderIcon = findFolderIcon(container);
if (folderIcon != null) {
FolderInfo folderInfo = (FolderInfo) folderIcon.getTag();
folderInfo.add(info, args.rank, false);
} else {
- Log.e(TAG, "Could not find folder with id " + folderIconId + " to add shortcut.");
+ Log.e(TAG, "Could not find folder with id " + container + " to add shortcut.");
}
}
}
+ public FolderIcon findFolderIcon(final long folderIconId) {
+ return (FolderIcon) mWorkspace.getFirstMatch(new ItemOperator() {
+ @Override
+ public boolean evaluate(ItemInfo info, View view) {
+ return info != null && info.id == folderIconId;
+ }
+ });
+ }
+
/**
* Add a widget to the workspace.
*