summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/AppsCustomizePagedView.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-11-13 15:47:05 -0800
committerWinson Chung <winsonc@google.com>2013-11-14 11:18:18 -0800
commiteeb5bbc9409978cc2ae52d48380399fcde3d9f85 (patch)
tree6a71c11e8ede1172e4013a49a5807897b28de241 /src/com/android/launcher3/AppsCustomizePagedView.java
parente248b83797e6b6ce128085560ad0c5b900413bf2 (diff)
downloadandroid_packages_apps_Trebuchet-eeb5bbc9409978cc2ae52d48380399fcde3d9f85.tar.gz
android_packages_apps_Trebuchet-eeb5bbc9409978cc2ae52d48380399fcde3d9f85.tar.bz2
android_packages_apps_Trebuchet-eeb5bbc9409978cc2ae52d48380399fcde3d9f85.zip
Use the icon bounds for all calculations.
- Fixes a drag and drop issue when the dynamic grid scales icons down, due to the drawable bounds not being equal to their bitmap sizes. Change-Id: If7c68b51131de7bac3195a2619e22340f7789432
Diffstat (limited to 'src/com/android/launcher3/AppsCustomizePagedView.java')
-rw-r--r--src/com/android/launcher3/AppsCustomizePagedView.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index d9ca1570b..688ff82aa 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -916,6 +916,13 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
@Override
+ public float getIntrinsicIconScaleFactor() {
+ LauncherAppState app = LauncherAppState.getInstance();
+ DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+ return (float) grid.allAppsIconSizePx / grid.iconSizePx;
+ }
+
+ @Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
cancelAllTasks();