diff options
| author | Winson Chung <winsonc@google.com> | 2014-01-10 23:40:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-10 23:40:40 +0000 |
| commit | 234b506f4625b23172d437a2ba0b47d63cc2e3dd (patch) | |
| tree | 9d521b162214586b1c3ce917ad9f8678fede55b5 /src/com/android/launcher3/Folder.java | |
| parent | 8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a (diff) | |
| parent | a694524047fda0a51dede4eefb1201a598d2d3a7 (diff) | |
| download | android_packages_apps_Trebuchet-234b506f4625b23172d437a2ba0b47d63cc2e3dd.tar.gz android_packages_apps_Trebuchet-234b506f4625b23172d437a2ba0b47d63cc2e3dd.tar.bz2 android_packages_apps_Trebuchet-234b506f4625b23172d437a2ba0b47d63cc2e3dd.zip | |
Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index a98d121a6..95038b67d 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -238,7 +238,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList return false; } - mLauncher.dismissFolderCling(null); + mLauncher.getLauncherClings().dismissFolderCling(null); mLauncher.getWorkspace().onDragStartedWithItem(v); mLauncher.getWorkspace().beginDragShared(v, this); @@ -466,7 +466,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList public void onAnimationEnd(Animator animation) { mState = STATE_OPEN; setLayerType(LAYER_TYPE_NONE, null); - Cling cling = mLauncher.showFirstRunFoldersCling(); + Cling cling = mLauncher.getLauncherClings().showFoldersCling(); if (cling != null) { cling.bringScrimToFront(); bringToFront(); |