diff options
Diffstat (limited to 'src/com/android/launcher3/LauncherProvider.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index b0098662a..d7de2c733 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -360,11 +360,7 @@ public class LauncherProvider extends ContentProvider { private static int getDefaultWorkspaceResourceId() { LauncherAppState app = LauncherAppState.getInstance(); DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); - if (LauncherAppState.isDisableAllApps()) { - return grid.defaultNoAllAppsLayoutId; - } else { - return grid.defaultLayoutId; - } + return grid.defaultLayoutId; } private static interface ContentValuesCallback { @@ -399,6 +395,7 @@ public class LauncherProvider extends ContentProvider { private static final String TAG_PARTNER_FOLDER = "partner-folder"; private static final String TAG_EXTRA = "extra"; private static final String TAG_INCLUDE = "include"; + private static final String TAG_FOLDER_ITEMS = "folderitems"; // Style attrs -- "Favorite" private static final String ATTR_CLASS_NAME = "className"; @@ -415,6 +412,7 @@ public class LauncherProvider extends ContentProvider { // Style attrs -- "Include" private static final String ATTR_WORKSPACE = "workspace"; + private static final String ATTR_FOLDER_ITEMS = "folderItems"; // Style attrs -- "Extra" private static final String ATTR_KEY = "key"; @@ -1668,7 +1666,10 @@ public class LauncherProvider extends ContentProvider { folderItems.add(id); } } else if (TAG_INCLUDE.equals(tag) && folderId >= 0) { - addToFolder(db, res, parser, folderItems, folderId); + final int resId = getAttributeResourceValue(parser, ATTR_FOLDER_ITEMS, 0); + XmlResourceParser itemsParser = res.getXml(resId); + beginDocument(itemsParser, TAG_FOLDER_ITEMS); + addToFolder(db, res, itemsParser, folderItems, folderId); } else { throw new RuntimeException("Folders can contain only shortcuts"); } |