diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-07-21 17:25:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-19 22:40:06 +0000 |
| commit | 82cc3fe6c77322d93ff74b25354e4bca77ab4a83 (patch) | |
| tree | 4fd03eb914c8c5d5c872b09b170382e9765a8a01 /src/com/android/launcher3/FolderIcon.java | |
| parent | ebf50c93b0d1a4f12329c92a3873a8409c566c7e (diff) | |
| parent | 6c5891a9fce95eee3d87823d11d21889743e9c68 (diff) | |
| download | android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.tar.gz android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.tar.bz2 android_packages_apps_Trebuchet-82cc3fe6c77322d93ff74b25354e4bca77ab4a83.zip | |
Merge "Preliminary work on Material Transitions" into ub-now-master
Diffstat (limited to 'src/com/android/launcher3/FolderIcon.java')
| -rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 4cf336f73..5b49fb87a 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -133,7 +133,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { final ViewGroup cellLayoutChildren = (ViewGroup) getParent(); final ViewGroup cellLayout = (ViewGroup) cellLayoutChildren.getParent(); final Workspace workspace = (Workspace) cellLayout.getParent(); - return !workspace.isSmall(); + return !workspace.workspaceInModalState(); } static FolderIcon fromXml(int resId, Launcher launcher, ViewGroup group, |