diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-02-26 12:34:42 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-02-26 12:35:09 -0800 |
commit | c9acdd51c40c1b397adae6ba62c4acd01914b473 (patch) | |
tree | f74dbd85f26408a56b2a823556a9bf3377bcb4ae /src/com/android/launcher3/Folder.java | |
parent | 560616da70648bed04c00aa804503ec72ace1337 (diff) | |
download | android_packages_apps_Trebuchet-c9acdd51c40c1b397adae6ba62c4acd01914b473.tar.gz android_packages_apps_Trebuchet-c9acdd51c40c1b397adae6ba62c4acd01914b473.tar.bz2 android_packages_apps_Trebuchet-c9acdd51c40c1b397adae6ba62c4acd01914b473.zip |
Removed disableAllApps flag
Change-Id: I50ba511b8493bca2506ab6010f141c093bfa7499
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 786d4a257..11e9835e8 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -143,13 +143,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList Resources res = getResources(); mMaxCountX = (int) grid.numColumns; - // Allow scrolling folders when DISABLE_ALL_APPS is true. - if (LauncherAppState.isDisableAllApps()) { - mMaxCountY = mMaxNumItems = Integer.MAX_VALUE; - } else { - mMaxCountY = (int) grid.numRows; - mMaxNumItems = mMaxCountX * mMaxCountY; - } + mMaxCountY = (int) grid.numRows; + mMaxNumItems = mMaxCountX * mMaxCountY; mInputMethodManager = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); @@ -1012,13 +1007,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList int contentAreaHeightSpec = MeasureSpec.makeMeasureSpec(getContentAreaHeight(), MeasureSpec.EXACTLY); - if (LauncherAppState.isDisableAllApps()) { - // Don't cap the height of the content to allow scrolling. - mContent.setFixedSize(getContentAreaWidth(), mContent.getDesiredHeight()); - } else { - mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight()); - } - + mContent.setFixedSize(getContentAreaWidth(), getContentAreaHeight()); mScrollView.measure(contentAreaWidthSpec, contentAreaHeightSpec); mFolderName.measure(contentAreaWidthSpec, MeasureSpec.makeMeasureSpec(mFolderNameHeight, MeasureSpec.EXACTLY)); |