From 606e47bf557cb23aa150acb237c8f0068cce50fc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <husson@archos.com>
Date: Fri, 10 Jun 2016 14:21:50 +0200
Subject: [PATCH] Add @empty type

---
 .../res/data/value/ResEmptyValue.java         | 49 +++++++++++++++++++
 .../res/data/value/ResValueFactory.java       |  6 ++-
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java
new file mode 100644
index 00000000..583e17d1
--- /dev/null
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResEmptyValue.java
@@ -0,0 +1,49 @@
+/**
+ *  Copyright 2016 Pierre-Hugues Husson <phh@phh.me>
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package brut.androlib.res.data.value;
+
+import brut.androlib.AndrolibException;
+import brut.androlib.res.data.ResResource;
+import brut.androlib.res.xml.ResValuesXmlSerializable;
+import java.io.IOException;
+import org.xmlpull.v1.XmlSerializer;
+
+public class ResEmptyValue extends ResScalarValue {
+    protected final int mValue;
+    private int type;
+
+    public ResEmptyValue(int value, String rawValue, int type) {
+        this(value, rawValue, "integer");
+        this.type = type;
+    }
+
+    public ResEmptyValue(int value, String rawValue, String type) {
+        super(type, value, rawValue);
+		if(value != 1)
+			throw new UnsupportedOperationException();
+        this.mValue = value;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    @Override
+    protected String encodeAsResXml() throws AndrolibException {
+        return "@empty";
+    }
+}
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
index 572042c8..e81a0526 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResValueFactory.java
@@ -36,7 +36,9 @@ public class ResValueFactory {
             case TypedValue.TYPE_NULL:
                 if (value == TypedValue.DATA_NULL_UNDEFINED) { // Special case $empty as explicitly defined empty value
                     return new ResStringValue(null, value);
-                }
+                } else if (value == TypedValue.DATA_NULL_EMPTY) {
+					return new ResEmptyValue(value, rawValue, type);
+				}
                 return new ResReferenceValue(mPackage, 0, null);
             case TypedValue.TYPE_REFERENCE:
                 return newReference(value, rawValue);
@@ -102,4 +104,4 @@ public class ResValueFactory {
     public ResReferenceValue newReference(int resID, String rawValue, boolean theme) {
         return new ResReferenceValue(mPackage, resID, rawValue, theme);
     }
-}
\ No newline at end of file
+}