aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts for merge of b564efb0 to ub-launcher3-master

Browse Source 
Change-Id: I4321522dd1b6b3f96e21232d113fad5144b630bc
This commit is contained in:
Sunny Goyal
2015-01-23 14:22:07 -08:00
parent 1660da5a03 b564efb024
commit b3a8f80e2e
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/launcher3/DefaultLayoutParser.java
View File

@@ -19,7 +19,6 @@ import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -36,10 +35,8 @@ public class DefaultLayoutParser extends AutoInstallsLayout {
private static final String TAG_SHORTCUT = "shortcut";
private static final String TAG_FOLDER = "folder";
private static final String TAG_PARTNER_FOLDER = "partner-folder";
private static final String TAG_INCLUDE = "include";
protected static final String ATTR_URI = "uri";
private static final String ATTR_WORKSPACE = "workspace";
private static final String ATTR_CONTAINER = "container";
private static final String ATTR_SCREEN = "screen";
private static final String ATTR_FOLDER_ITEMS = "folderItems";
@@ -89,25 +86,6 @@ public class DefaultLayoutParser extends AutoInstallsLayout {
out[1] = Long.parseLong(getAttributeValue(parser, ATTR_SCREEN));
}
@Override
protected int parseAndAddNode(
XmlResourceParser parser,
HashMap<String, TagParser> tagParserMap,
ArrayList<Long> screenIds)
throws XmlPullParserException, IOException {
if (TAG_INCLUDE.equals(parser.getName())) {
final int resId = getAttributeResourceValue(parser, ATTR_WORKSPACE, 0);
if (resId != 0) {
// recursively load some more favorites, why not?
return parseLayout(resId, screenIds);
} else {
return 0;
}
} else {
return super.parseAndAddNode(parser, tagParserMap, screenIds);
}
}
/**
* AppShortcutParser which also supports adding URI based intents
*/