summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/CellLayout.java
diff options
context:
space:
mode:
authorNilesh Agrawal <nileshagrawal@google.com>2014-01-02 15:54:57 -0800
committerNilesh Agrawal <nileshagrawal@google.com>2014-01-02 15:55:53 -0800
commit5f7099af8573c2229427318acd551b92efae02a3 (patch)
tree201e91901665a3e207b60790660866864ea806bf /src/com/android/launcher3/CellLayout.java
parent72b4c7c3df6be428e543c2a28f9b325e0e6d9f2b (diff)
downloadandroid_packages_apps_Trebuchet-5f7099af8573c2229427318acd551b92efae02a3.tar.gz
android_packages_apps_Trebuchet-5f7099af8573c2229427318acd551b92efae02a3.tar.bz2
android_packages_apps_Trebuchet-5f7099af8573c2229427318acd551b92efae02a3.zip
Allow scrolling folders in when all apps is disabled.
Allows for more items to be added into a folder. Allows for scrolling by letting the content area inside the scroll view to be taller. The height of content area was capped in https://googleplex-android-review.git.corp.google.com/#/c/387583/ Change-Id: I8d7950ac9c155e26c5a299c17ae6a2bbf829dce6
Diffstat (limited to 'src/com/android/launcher3/CellLayout.java')
-rw-r--r--src/com/android/launcher3/CellLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java
index fa6ce9631..2436a51a3 100644
--- a/src/com/android/launcher3/CellLayout.java
+++ b/src/com/android/launcher3/CellLayout.java
@@ -199,7 +199,7 @@ public class CellLayout extends ViewGroup {
TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CellLayout, defStyle, 0);
mCellWidth = mCellHeight = -1;
- mFixedCellHeight = mFixedCellHeight = -1;
+ mFixedCellWidth = mFixedCellHeight = -1;
mWidthGap = mOriginalWidthGap = 0;
mHeightGap = mOriginalHeightGap = 0;
mMaxGap = Integer.MAX_VALUE;