From 5087e915e16d639fe6a947a26441639ef182b950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Sun, 29 Aug 2010 23:41:29 +0200
Subject: [PATCH] Don't generate sdkVersion ("-v") qualifiers if they're
 "natural".

---
 src/brut/androlib/res/data/ResConfigFlags.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/brut/androlib/res/data/ResConfigFlags.java b/src/brut/androlib/res/data/ResConfigFlags.java
index dc90a883..2fc1975f 100644
--- a/src/brut/androlib/res/data/ResConfigFlags.java
+++ b/src/brut/androlib/res/data/ResConfigFlags.java
@@ -231,13 +231,28 @@ public class ResConfigFlags {
                 ret.append(String.format("-%dx%d", screenHeight, screenWidth));
             }
         }
-        if (sdkVersion != 0) {
+        if (sdkVersion > getNaturalSdkVersionRequirement()) {
             ret.append("-v").append(sdkVersion);
         }
 
         return ret.toString();
     }
 
+    private short getNaturalSdkVersionRequirement() {
+        if (
+               (uiMode & (MASK_UI_MODE_TYPE | MASK_UI_MODE_NIGHT)) != 0
+        ) {
+            return 8;
+        }
+        if (
+               (screenLayout & (MASK_SCREENSIZE | MASK_SCREENLONG)) != 0
+            || density != DENSITY_DEFAULT
+        ) {
+            return 4;
+        }
+        return 0;
+    }
+
     @Override
     public String toString() {
         return ! getQualifiers().equals("") ? getQualifiers() : "[DEFAULT]";