From 316353f83f7a704529912b5cebaf73ef41c7c7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Sat, 14 May 2011 03:49:24 +0200
Subject: [PATCH] ResStringValue::encodeAsXmlValue() : enumerate non-positional
 substitutions.

---
 .../brut/androlib/res/data/value/ResStringValue.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java
index c356e70d..0e5db398 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResStringValue.java
@@ -42,7 +42,8 @@ public class ResStringValue extends ResScalarValue {
 
     @Override
     public String encodeAsResXmlValue() {
-        return ResXmlEncoders.encodeAsXmlValue(mRawValue);
+        return ResXmlEncoders.enumerateNonPositionalSubstitutions(
+                ResXmlEncoders.encodeAsXmlValue(mRawValue));
     }
 
     @Override
@@ -50,6 +51,12 @@ public class ResStringValue extends ResScalarValue {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    protected String serializeXmlBody(XmlSerializer serializer, ResResource res)
+            throws IOException, AndrolibException {
+        return ResXmlEncoders.encodeAsXmlValue(mRawValue);
+    }
+
     @Override
     protected void serializeExtraXmlAttrs(XmlSerializer serializer,
             ResResource res) throws IOException {