summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/folder
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-12-12 20:45:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-12 20:45:17 +0000
commit776ca257cefcf2a94e06bf89df6267c945708afe (patch)
treecac47db17673d314669327d41ec8baabdcc6baba /src/com/android/launcher3/folder
parent177bb5a9ba7c94a0ba5bfca842b2abf883b02bb7 (diff)
parentc13403c612748bfdf06436510600230c4c4b55ec (diff)
downloadandroid_packages_apps_Trebuchet-776ca257cefcf2a94e06bf89df6267c945708afe.tar.gz
android_packages_apps_Trebuchet-776ca257cefcf2a94e06bf89df6267c945708afe.tar.bz2
android_packages_apps_Trebuchet-776ca257cefcf2a94e06bf89df6267c945708afe.zip
Merge "Defining various modes for CellLayout: Workspace, Hotseat & Folder" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/folder')
-rw-r--r--src/com/android/launcher3/folder/FolderPagedView.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java
index e71c5e9cc..8aaeb9e37 100644
--- a/src/com/android/launcher3/folder/FolderPagedView.java
+++ b/src/com/android/launcher3/folder/FolderPagedView.java
@@ -253,11 +253,9 @@ public class FolderPagedView extends PagedView {
private CellLayout createAndAddNewPage() {
DeviceProfile grid = Launcher.getLauncher(getContext()).getDeviceProfile();
- CellLayout page = new CellLayout(getContext());
+ CellLayout page = (CellLayout) mInflater.inflate(R.layout.folder_page, this, false);
page.setCellDimensions(grid.folderCellWidthPx, grid.folderCellHeightPx);
page.getShortcutsAndWidgets().setMotionEventSplittingEnabled(false);
- page.getShortcutsAndWidgets().setContainerType(ShortcutAndWidgetContainer.FOLDER);
- page.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
page.setInvertIfRtl(true);
page.setGridSize(mGridCountX, mGridCountY);