From a28f40692a43412eb653a11188947fcd0b0711ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ryszard=20Wi=C5=9Bniewski?= <brut.alll@gmail.com>
Date: Sat, 28 Aug 2010 20:47:21 +0200
Subject: [PATCH] ResConfigFlags: swapped screenLayout and sdkVersion.

---
 src/brut/androlib/res/data/ResConfigFlags.java | 9 +++++----
 src/brut/androlib/res/decoder/ARSCDecoder.java | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/brut/androlib/res/data/ResConfigFlags.java b/src/brut/androlib/res/data/ResConfigFlags.java
index 7e4a6131..8508f7d1 100644
--- a/src/brut/androlib/res/data/ResConfigFlags.java
+++ b/src/brut/androlib/res/data/ResConfigFlags.java
@@ -37,10 +37,11 @@ public class ResConfigFlags {
 
     public final short screenWidth;
     public final short screenHeight;
-    public final byte screenLayout;
 
     public final short sdkVersion;
 
+    public final byte screenLayout;
+
     private final String mQualifiers;
 
     public ResConfigFlags() {
@@ -56,15 +57,15 @@ public class ResConfigFlags {
         inputFlags = KEYSHIDDEN_ANY | NAVHIDDEN_ANY;
         screenWidth = 0;
         screenHeight = 0;
-        screenLayout = SCREENLONG_ANY | SCREENSIZE_ANY;
         sdkVersion = 0;
+        screenLayout = SCREENLONG_ANY | SCREENSIZE_ANY;
         mQualifiers = "";
     }
 
     public ResConfigFlags(short mcc, short mnc, char[] language, char[] country,
             byte orientation, byte touchscreen, short density, byte keyboard,
             byte navigation, byte inputFlags, short screenWidth,
-            short screenHeight, byte screenLayout, short sdkVersion) {
+            short screenHeight, short sdkVersion, byte screenLayout) {
         this.mcc = mcc;
         this.mnc = mnc;
         this.language = language;
@@ -77,8 +78,8 @@ public class ResConfigFlags {
         this.inputFlags = inputFlags;
         this.screenWidth = screenWidth;
         this.screenHeight = screenHeight;
-        this.screenLayout = screenLayout;
         this.sdkVersion = sdkVersion;
+        this.screenLayout = screenLayout;
         mQualifiers = generateQualifiers();
     }
 
diff --git a/src/brut/androlib/res/decoder/ARSCDecoder.java b/src/brut/androlib/res/decoder/ARSCDecoder.java
index d6b8633f..37d4fd30 100644
--- a/src/brut/androlib/res/decoder/ARSCDecoder.java
+++ b/src/brut/androlib/res/decoder/ARSCDecoder.java
@@ -255,7 +255,7 @@ public class ARSCDecoder {
 
         return new ResConfigFlags(mcc, mnc, language, country, orientation,
             touchscreen, density, keyboard, navigation, inputFlags,
-            screenWidth, screenHeight, screenLayout, sdkVersion);
+            screenWidth, screenHeight, sdkVersion, screenLayout);
     }
 
     private void addMissingResSpecs() throws AndrolibException {