diff options
author | Winson Chung <winsonc@google.com> | 2013-11-14 19:19:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 19:19:25 +0000 |
commit | 89ee93e0f8b6ac1ed6aefc2b940d1606f2027491 (patch) | |
tree | 28a865dcb28145e8218fac71351cff52bac45ba5 /src/com/android/launcher3/Folder.java | |
parent | 4e2683a4b582d28bb320308b5e5f3541ae1aa310 (diff) | |
parent | eeb5bbc9409978cc2ae52d48380399fcde3d9f85 (diff) | |
download | android_packages_apps_Trebuchet-89ee93e0f8b6ac1ed6aefc2b940d1606f2027491.tar.gz android_packages_apps_Trebuchet-89ee93e0f8b6ac1ed6aefc2b940d1606f2027491.tar.bz2 android_packages_apps_Trebuchet-89ee93e0f8b6ac1ed6aefc2b940d1606f2027491.zip |
Merge "Use the icon bounds for all calculations." into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 051461515..1d234ff8a 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -792,6 +792,11 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } @Override + public float getIntrinsicIconScaleFactor() { + return 1f; + } + + @Override public boolean supportsFlingToDelete() { return true; } |