summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-06-20 10:58:36 -0700
committerJon Miranda <jonmiranda@google.com>2017-06-23 11:47:48 -0700
commitb28c4fcf351dc9f44f69253b227880758f6b460c (patch)
tree1a75f63300be881006ab64d5d39ef0b815826d85 /src/com/android/launcher3/CellLayout.java
parenta9d721df781bf4d195eb52bba1f9a3193f7eaad4 (diff)
downloadandroid_packages_apps_Trebuchet-b28c4fcf351dc9f44f69253b227880758f6b460c.tar.gz
android_packages_apps_Trebuchet-b28c4fcf351dc9f44f69253b227880758f6b460c.tar.bz2
android_packages_apps_Trebuchet-b28c4fcf351dc9f44f69253b227880758f6b460c.zip
Landscape grid changes for Workspace/All Apps.
This is the just first CL to get eyes on the changes. Next CL will update the All Apps to be full width. Bug: 37015359 Change-Id: I2d7ec6851fdc13b8fa654e7e2be3152330243ccc
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index d07e3303d..d99a30ae7 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -154,7 +154,7 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
@ContainerType private final int mContainerType;
- private final float mChildScale;
+ private final float mChildScale = 1f;
public static final int MODE_SHOW_REORDER_HINT = 0;
public static final int MODE_DRAG_OVER = 1;
@@ -218,8 +218,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler {
mFolderLeaveBehind.delegateCellX = -1;
mFolderLeaveBehind.delegateCellY = -1;
- mChildScale = mContainerType == HOTSEAT ? grid.inv.hotseatScale : 1f;
-
setAlwaysDrawnWithCacheEnabled(false);
final Resources res = getResources();