From decdca0763207b72d82d40f70a9ed81e4e8fce7b Mon Sep 17 00:00:00 2001
From: paphonb <paphonb@gmail.com>
Date: Mon, 10 Jul 2017 10:51:26 +0700
Subject: [PATCH] Fix weird issue from new Gradle build tools

---
 res/xml/default_workspace_3x3.xml                 | 2 +-
 res/xml/default_workspace_4x4.xml                 | 2 +-
 res/xml/default_workspace_5x5.xml                 | 2 +-
 res/xml/default_workspace_5x6.xml                 | 2 +-
 res/xml/default_workspace_6x6.xml                 | 2 +-
 res/xml/device_profiles.xml                       | 2 +-
 res/xml/dw_phone_hotseat.xml                      | 2 +-
 res/xml/dw_tablet_hotseat.xml                     | 2 +-
 src/com/android/launcher3/AutoInstallsLayout.java | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/res/xml/default_workspace_3x3.xml b/res/xml/default_workspace_3x3.xml
index 8d99404504..2aee3d82df 100644
--- a/res/xml/default_workspace_3x3.xml
+++ b/res/xml/default_workspace_3x3.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <!-- Messaging, [All Apps], Dialer -->
diff --git a/res/xml/default_workspace_4x4.xml b/res/xml/default_workspace_4x4.xml
index 979a1b4c84..c9de609f38 100644
--- a/res/xml/default_workspace_4x4.xml
+++ b/res/xml/default_workspace_4x4.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <!-- Hotseat -->
     <include launcher:workspace="@xml/dw_phone_hotseat" />
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index f9cc0e789b..603873050a 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <!-- Hotseat -->
     <include launcher:workspace="@xml/dw_phone_hotseat" />
diff --git a/res/xml/default_workspace_5x6.xml b/res/xml/default_workspace_5x6.xml
index 8493c265e2..b6f9128621 100644
--- a/res/xml/default_workspace_5x6.xml
+++ b/res/xml/default_workspace_5x6.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <!-- Hotseat -->
     <include launcher:workspace="@xml/dw_tablet_hotseat" />
diff --git a/res/xml/default_workspace_6x6.xml b/res/xml/default_workspace_6x6.xml
index 6bddd34865..9610c83860 100644
--- a/res/xml/default_workspace_6x6.xml
+++ b/res/xml/default_workspace_6x6.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <!-- Hotseat -->
     <include launcher:workspace="@xml/dw_tablet_hotseat" />
diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml
index 19bdfc810b..8d815dffd7 100644
--- a/res/xml/device_profiles.xml
+++ b/res/xml/device_profiles.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" >
+<profiles xmlns:launcher="http://schemas.android.com/apk/res-auto">
 
     <profile
         launcher:name="Pixel (Display Size set to Largest)"
diff --git a/res/xml/dw_phone_hotseat.xml b/res/xml/dw_phone_hotseat.xml
index b58994d1d7..031d0d7a11 100644
--- a/res/xml/dw_phone_hotseat.xml
+++ b/res/xml/dw_phone_hotseat.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <!-- Dialer, Messaging, [All Apps], Browser, Camera -->
     <resolve
diff --git a/res/xml/dw_tablet_hotseat.xml b/res/xml/dw_tablet_hotseat.xml
index 671ccba3c5..40e6379694 100644
--- a/res/xml/dw_tablet_hotseat.xml
+++ b/res/xml/dw_tablet_hotseat.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3">
+<favorites xmlns:launcher="http://schemas.android.com/apk/res-auto">
     <!-- Hotseat (We use the screen as the position of the item in the hotseat) -->
     <!-- Messaging, Email, Browser, [All Apps], Music, Gallery, Camera -->
     <resolve
diff --git a/src/com/android/launcher3/AutoInstallsLayout.java b/src/com/android/launcher3/AutoInstallsLayout.java
index d82579bf77..fd398ed46f 100644
--- a/src/com/android/launcher3/AutoInstallsLayout.java
+++ b/src/com/android/launcher3/AutoInstallsLayout.java
@@ -646,7 +646,7 @@ public class AutoInstallsLayout {
      */
     protected static String getAttributeValue(XmlResourceParser parser, String attribute) {
         String value = parser.getAttributeValue(
-                "http://schemas.android.com/apk/res-auto/com.android.launcher3", attribute);
+                "http://schemas.android.com/apk/res-auto", attribute);
         if (value == null) {
             value = parser.getAttributeValue(null, attribute);
         }
@@ -660,7 +660,7 @@ public class AutoInstallsLayout {
     protected static int getAttributeResourceValue(XmlResourceParser parser, String attribute,
             int defaultValue) {
         int value = parser.getAttributeResourceValue(
-                "http://schemas.android.com/apk/res-auto/com.android.launcher3", attribute,
+                "http://schemas.android.com/apk/res-auto", attribute,
                 defaultValue);
         if (value == defaultValue) {
             value = parser.getAttributeResourceValue(null, attribute, defaultValue);