ResConfigFlags: swapped screenLayout and sdkVersion.

This commit is contained in:
Ryszard Wiśniewski 2010-08-28 20:47:21 +02:00
parent 2f28ef78f3
commit a28f40692a
2 changed files with 6 additions and 5 deletions

View File

@ -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();
}

View File

@ -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 {