From 1e78f27dbd5113cfd89cf951ba2d7f72882b96e5 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 25 Jul 2012 08:44:01 -0500
Subject: [PATCH] adding v1.4.9 and new uimode changes

---
 apktool-cli/pom.xml                           |  2 +-
 apktool-lib/pom.xml                           |  2 +-
 .../androlib/res/data/ResConfigFlags.java     | 38 ++++++++++++-------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index c14f26f4..572fa44f 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-cli</artifactId>
-    <version>1.4.8-SNAPSHOT</version>
+    <version>1.4.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index b9390778..3b4d2787 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-lib</artifactId>
-    <version>1.4.8-SNAPSHOT</version>
+    <version>1.4.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java b/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
index 3151b1e6..66473ba3 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
@@ -199,6 +199,18 @@ public class ResConfigFlags {
             case UI_MODE_TYPE_TELEVISION:
                 ret.append("-television");
                 break;
+            case UI_MODE_TYPE_SMALLUI:
+                ret.append("-smallui");
+                break;
+            case UI_MODE_TYPE_MEDIUMUI:
+                ret.append("-mediumui");
+                break;
+            case UI_MODE_TYPE_LARGEUI:
+                ret.append("-largeui");
+                break;
+            case UI_MODE_TYPE_HUGEUI:
+                ret.append("-hugeui");
+                break;
             case UI_MODE_TYPE_APPLIANCE:
                 ret.append("-appliance");
                 break;
@@ -229,9 +241,9 @@ public class ResConfigFlags {
             case DENSITY_XHIGH:
                 ret.append("-xhdpi");
                 break;
-	    case DENSITY_XXHIGH:
-		ret.append("-xxhdpi");
-		break;
+            case DENSITY_XXHIGH:
+                ret.append("-xxhdpi");
+                break;
             case DENSITY_NONE:
                 ret.append("-nodpi");
                 break;
@@ -311,21 +323,15 @@ public class ResConfigFlags {
     }
 
     private short getNaturalSdkVersionRequirement() {
-        if (
-                   smallestScreenWidthDp != 0 || screenWidthDp != 0
-                || screenHeightDp != 0
-        ) {
+        if (smallestScreenWidthDp != 0 || screenWidthDp != 0
+                || screenHeightDp != 0) {
             return 13;
         }
-        if (
-               (uiMode & (MASK_UI_MODE_TYPE | MASK_UI_MODE_NIGHT)) != 0
-        ) {
+        if ((uiMode & (MASK_UI_MODE_TYPE | MASK_UI_MODE_NIGHT)) != 0) {
             return 8;
         }
-        if (
-               (screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != 0
-            || density != DENSITY_DEFAULT
-        ) {
+        if ((screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != 0
+                || density != DENSITY_DEFAULT) {
             return 4;
         }
         return 0;
@@ -421,6 +427,10 @@ public class ResConfigFlags {
     public final static byte UI_MODE_TYPE_CAR = 0x03;
     public final static byte UI_MODE_TYPE_TELEVISION = 0x04;
     public final static byte UI_MODE_TYPE_APPLIANCE = 0x05;
+    public final static byte UI_MODE_TYPE_SMALLUI = 0x0c;
+    public final static byte UI_MODE_TYPE_MEDIUMUI = 0x0d;
+    public final static byte UI_MODE_TYPE_LARGEUI = 0x0e;
+    public final static byte UI_MODE_TYPE_HUGEUI = 0x0f;
 
     public final static byte MASK_UI_MODE_NIGHT = 0x30;
     public final static byte UI_MODE_NIGHT_ANY = 0x00;