From d18ee186dadf670b69f86be617ff7770a77ca29f Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Tue, 30 Apr 2013 07:53:52 -0500
Subject: [PATCH] Update density ConfigFlags to ints, updated internal windows
 aapt.

---
 .../androlib/res/data/ResConfigFlags.java     |  20 +++++++++---------
 .../resources/prebuilt/aapt/windows/aapt.exe  | Bin 6200209 -> 6200209 bytes
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
index a27c54bf..cbbe5c79 100644
--- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -343,10 +343,10 @@ public class ResConfigFlags {
                 || screenHeightDp != 0) {
             return SDK_HONEYCOMB_MR2;
         }
-        if ((uiMode & (MASK_UI_MODE_TYPE | MASK_UI_MODE_NIGHT)) != 0) {
+        if ((uiMode & (MASK_UI_MODE_TYPE | MASK_UI_MODE_NIGHT)) != UI_MODE_NIGHT_ANY) {
             return SDK_FROYO;
         }
-        if ((screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != 0
+        if ((screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != SCREENSIZE_ANY
                 || density != DENSITY_DEFAULT) {
             return SDK_DONUT;
         }
@@ -409,14 +409,14 @@ public class ResConfigFlags {
     public final static byte TOUCHSCREEN_STYLUS = 2;
     public final static byte TOUCHSCREEN_FINGER = 3;
 
-    public final static short DENSITY_DEFAULT = 0;
-    public final static short DENSITY_LOW = 120;
-    public final static short DENSITY_MEDIUM = 160;
-    public final static short DENSITY_TV = 213;
-    public final static short DENSITY_HIGH = 240;
-    public final static short DENSITY_XHIGH = 320;
-    public final static short DENSITY_XXHIGH = 480;
-    public final static short DENSITY_NONE = -1;
+    public final static int DENSITY_DEFAULT = 0;
+    public final static int DENSITY_LOW = 120;
+    public final static int DENSITY_MEDIUM = 160;
+    public final static int DENSITY_TV = 213;
+    public final static int DENSITY_HIGH = 240;
+    public final static int DENSITY_XHIGH = 320;
+    public final static int DENSITY_XXHIGH = 480;
+    public final static int DENSITY_NONE = -1;
 
     public final static short MASK_LAYOUTDIR = 0xc0;
     public final static short SCREENLAYOUT_LAYOUTDIR_ANY = 0x00;
diff --git a/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/windows/aapt.exe b/brut.apktool/apktool-lib/src/main/resources/prebuilt/aapt/windows/aapt.exe
index 2a8cd86541abd7543223cfad6510021a120b1003..e65761b11b8533e6256d597f8a46621515f67a7a 100755
GIT binary patch
delta 318
zcmWN=*GWSG06<ZEvDesp?>(_3#$IAK_HG1M@#CT(h}pm;BvWL8yG8y){Llj@ll=)Y
z|36+s-@i|pw^R_kKZ^wzU<eDb2#c`<OR)^gu>vcx3ahaO!&r-TSdR_Zh)vjxE!c`}
z*p408iCx%@J=lwV*pCA^h(kDxBRGm<IF1uIiBmX@5scyt&f*--V+`ZCfC*g0C0xc8
zT*Wn9#|_-XEllDz?%*!&;XWSVAs%50kMRUg@eI%L0x$6juki+N@ec3t;mdS5R}zay
Rld(kPC7(-Y^SQ^*+#ibUqn!W%

delta 318
zcmWN=M=}Ed06@`^AiC(i_Z~t-Cn0L|C=sV{0*gP)*vJiB!sHaWz(0arwpP5EmoNMV
z^8Y{IgYlnC{v#d8zPyTM7{DNwV+B@X2&=FfYp@pUupS$*5yRMo&Desi*oN)cft}ce
z-PnV@*oXZ%fP*-M!#IMYIELdmfs;6e(>Q~(IEVANfDv58C5+-Su3!vTF^+4vjvKg%
zTeyuoxQlz3z$EVD0jBT}kMI~z@D$H5jpulQmw1KOc!Rf?!8^Ri2YkdVK7E@D7ekR)
SA{mdS-b%$>p;UbSD*ge=)T0;x