diff options
author | Nilesh Agrawal <nileshagrawal@google.com> | 2014-01-09 17:14:01 -0800 |
---|---|---|
committer | Nilesh Agrawal <nileshagrawal@google.com> | 2014-01-09 17:21:09 -0800 |
commit | 16f3ea870aac47292cd6cbe1a4b4343173097aa9 (patch) | |
tree | e647ae9f22957071d53b2a482a515fa5f2b97593 /src/com/android/launcher3/Folder.java | |
parent | 0259c629cb5b280d0d9c821f8b1685707d7ba589 (diff) | |
download | android_packages_apps_Trebuchet-16f3ea870aac47292cd6cbe1a4b4343173097aa9.tar.gz android_packages_apps_Trebuchet-16f3ea870aac47292cd6cbe1a4b4343173097aa9.tar.bz2 android_packages_apps_Trebuchet-16f3ea870aac47292cd6cbe1a4b4343173097aa9.zip |
Allow DISABLE_ALL_APPS to be set using a system property.
- Moving the property to LauncherAppState
- The property is only read on dogfood builds.
The property can be set using setprop or /data/local.prop
Change-Id: I14c7354efb12edb93f97e81687a6f920cc634e9a
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 758ee5bab..a98d121a6 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -146,7 +146,7 @@ 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 (AppsCustomizePagedView.DISABLE_ALL_APPS) { + if (LauncherAppState.isDisableAllApps()) { mMaxCountY = mMaxNumItems = Integer.MAX_VALUE; } else { mMaxCountY = (int) grid.numRows; @@ -1018,7 +1018,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList int contentAreaHeightSpec = MeasureSpec.makeMeasureSpec(getContentAreaHeight(), MeasureSpec.EXACTLY); - if (AppsCustomizePagedView.DISABLE_ALL_APPS) { + if (LauncherAppState.isDisableAllApps()) { // Don't cap the height of the content to allow scrolling. mContent.setFixedSize(getContentAreaWidth(), mContent.getDesiredHeight()); } else { |