summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Folder.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-08-22 16:09:37 -0700
committerSunny Goyal <sunnygoyal@google.com>2014-08-25 11:38:02 -0700
commit424418bb50ccf5d9270650b70cc51f423da51a65 (patch)
tree23c7b40d02e7b4dfda6395b7b30ea6305a27dd1a /src/com/android/launcher3/Folder.java
parentdec12adb6dba114ad2feedce3a9f3ce0c178fc04 (diff)
downloadandroid_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.tar.gz
android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.tar.bz2
android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.zip
Updating clings, removing ununsed clings
issue: 16127412 Change-Id: I1d18515765100ff10d33439b3ac39ebfc5da35c7
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r--src/com/android/launcher3/Folder.java11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index f26f87c39..6bd4e0e2f 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -248,8 +248,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
return false;
}
- mLauncher.getLauncherClings().dismissFolderCling(null);
-
mLauncher.getWorkspace().beginDragShared(v, this);
mCurrentDragInfo = item;
@@ -553,15 +551,6 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
onCompleteRunnable.run();
}
- // Only show cling if we are not in the middle of a drag - this would be quite jarring.
- if (!mDragController.isDragging()) {
- Cling cling = mLauncher.getLauncherClings().showFoldersCling();
- if (cling != null) {
- cling.bringScrimToFront();
- bringToFront();
- cling.bringToFront();
- }
- }
setFocusOnFirstChild();
}
});