diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-22 16:09:37 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-08-25 11:38:02 -0700 |
commit | 424418bb50ccf5d9270650b70cc51f423da51a65 (patch) | |
tree | 23c7b40d02e7b4dfda6395b7b30ea6305a27dd1a /src/com/android/launcher3/Workspace.java | |
parent | dec12adb6dba114ad2feedce3a9f3ce0c178fc04 (diff) | |
download | android_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/Workspace.java')
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 6d217017e..866125147 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -596,7 +596,6 @@ public class Workspace extends SmoothPagedView mDefaultPage = mOriginalDefaultPage + 1; // Update the custom content hint - mLauncher.getLauncherClings().updateCustomContentHintVisibility(); if (mRestorePage != INVALID_RESTORE_PAGE) { mRestorePage = mRestorePage + 1; } else { @@ -625,7 +624,6 @@ public class Workspace extends SmoothPagedView mDefaultPage = mOriginalDefaultPage - 1; // Update the custom content hint - mLauncher.getLauncherClings().updateCustomContentHintVisibility(); if (mRestorePage != INVALID_RESTORE_PAGE) { mRestorePage = mRestorePage - 1; } else { @@ -2702,10 +2700,6 @@ public class Workspace extends SmoothPagedView if (child instanceof BubbleTextView) { BubbleTextView icon = (BubbleTextView) child; icon.clearPressedBackground(); - } else if (child instanceof FolderIcon) { - // The folder cling isn't flexible enough to be shown in non-default workspace positions - // Also if they are dragging it a folder, we assume they don't need to see the cling. - mLauncher.markFolderClingDismissedIfNecessary(); } if (child.getTag() == null || !(child.getTag() instanceof ItemInfo)) { @@ -3053,10 +3047,6 @@ public class Workspace extends SmoothPagedView // cell also contains a shortcut, then create a folder with the two shortcuts. if (!mInScrollArea && createUserFolderIfNecessary(cell, container, dropTargetLayout, mTargetCell, distance, false, d.dragView, null)) { - // The folder cling isn't flexible enough to be shown in non-default workspace - // positions. Also if they are creating a folder, we assume they don't need to - // see the cling. - mLauncher.markFolderClingDismissedIfNecessary(); return; } @@ -3965,10 +3955,6 @@ public class Workspace extends SmoothPagedView d.postAnimationRunnable = exitSpringLoadedRunnable; if (createUserFolderIfNecessary(view, container, cellLayout, mTargetCell, distance, true, d.dragView, d.postAnimationRunnable)) { - // The folder cling isn't flexible enough to be shown in non-default workspace - // positions. Also if they are creating a folder, we assume they don't need to - // see the cling. - mLauncher.markFolderClingDismissedIfNecessary(); return; } if (addToExistingFolderIfNecessary(view, cellLayout, mTargetCell, distance, d, |