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

Change-Id: I4321522dd1b6b3f96e21232d113fad5144b630bc

1 files changed, 15 insertions, 0 deletions

diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index 0fa4cbb75..908bd3d79 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -78,6 +78,7 @@ public class AutoInstallsLayout {
     }
 
     // Object Tags
+    private static final String TAG_INCLUDE = "include";
     private static final String TAG_WORKSPACE = "workspace";
     private static final String TAG_APP_ICON = "appicon";
     private static final String TAG_AUTO_INSTALL = "autoinstall";
@@ -100,6 +101,9 @@ public class AutoInstallsLayout {
     private static final String ATTR_ICON = "icon";
     private static final String ATTR_URL = "url";
 
+    // Attrs for "Include"
+    private static final String ATTR_WORKSPACE = "workspace";
+
     // Style attrs -- "Extra"
     private static final String ATTR_KEY = "key";
     private static final String ATTR_VALUE = "value";
@@ -208,6 +212,17 @@ public class AutoInstallsLayout {
             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;
+            }
+        }
+
         mValues.clear();
         parseContainerAndScreen(parser, mTemp);
         final long container = mTemp[0];