ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-05-03 07:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tweak colorimetry to colorMode

Browse Source
This commit is contained in:
Connor Tumbleson 2017-08-23 17:03:51 -04:00
parent 68a7eb7a74
commit 0f4cfcb892
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResConfigFlags.java
View File

@ -52,7 +52,7 @@ public class ResConfigFlags {
private final char[] localeVariant; private final char[] localeVariant;
private final byte screenLayout2; private final byte screenLayout2;
private final byte colorimetry; private final byte colorMode;
public final boolean isInvalid; public final boolean isInvalid;
@ -82,7 +82,7 @@ public class ResConfigFlags {
localeScript = null; localeScript = null;
localeVariant = null; localeVariant = null;
screenLayout2 = 0; screenLayout2 = 0;
colorimetry = COLOR_WIDE_UNDEFINED; colorMode = COLOR_WIDE_UNDEFINED;
isInvalid = false; isInvalid = false;
mQualifiers = ""; mQualifiers = "";
size = 0; size = 0;
@ -95,7 +95,7 @@ public class ResConfigFlags {
short sdkVersion, byte screenLayout, byte uiMode, short sdkVersion, byte screenLayout, byte uiMode,
short smallestScreenWidthDp, short screenWidthDp, short smallestScreenWidthDp, short screenWidthDp,
short screenHeightDp, char[] localeScript, char[] localeVariant, short screenHeightDp, char[] localeScript, char[] localeVariant,
byte screenLayout2, byte colorimetry, boolean isInvalid, int size) { byte screenLayout2, byte colorMode, boolean isInvalid, int size) {
if (orientation < 0 || orientation > 3) { if (orientation < 0 || orientation > 3) {
LOGGER.warning("Invalid orientation value: " + orientation); LOGGER.warning("Invalid orientation value: " + orientation);
orientation = 0; orientation = 0;
@ -159,7 +159,7 @@ public class ResConfigFlags {
this.localeScript = localeScript; this.localeScript = localeScript;
this.localeVariant = localeVariant; this.localeVariant = localeVariant;
this.screenLayout2 = screenLayout2; this.screenLayout2 = screenLayout2;
this.colorimetry = colorimetry; this.colorMode = colorMode;
this.isInvalid = isInvalid; this.isInvalid = isInvalid;
this.size = size; this.size = size;
mQualifiers = generateQualifiers(); mQualifiers = generateQualifiers();
@ -235,7 +235,15 @@ public class ResConfigFlags {
ret.append("-notlong"); ret.append("-notlong");
break; break;
} }
switch (colorimetry & COLOR_HDR_MASK) { switch (screenLayout2 & MASK_SCREENROUND) {
case SCREENLAYOUT_ROUND_NO:
ret.append("-notround");
break;
case SCREENLAYOUT_ROUND_YES:
ret.append("-round");
break;
}
switch (colorMode & COLOR_HDR_MASK) {
case COLOR_HDR_YES: case COLOR_HDR_YES:
ret.append("-highdr"); ret.append("-highdr");
break; break;
@ -243,7 +251,7 @@ public class ResConfigFlags {
ret.append("-lowdr"); ret.append("-lowdr");
break; break;
} }
switch (colorimetry & COLOR_WIDE_MASK) { switch (colorMode & COLOR_WIDE_MASK) {
case COLOR_WIDE_YES: case COLOR_WIDE_YES:
ret.append("-widecg"); ret.append("-widecg");
break; break;
@ -251,14 +259,6 @@ public class ResConfigFlags {
ret.append("-nowidecg"); ret.append("-nowidecg");
break; break;
} }
switch (screenLayout2 & MASK_SCREENROUND) {
case SCREENLAYOUT_ROUND_NO:
ret.append("-notround");
break;
case SCREENLAYOUT_ROUND_YES:
ret.append("-round");
break;
}
switch (orientation) { switch (orientation) {
case ORIENTATION_PORT: case ORIENTATION_PORT:
ret.append("-port"); ret.append("-port");
@ -419,7 +419,7 @@ public class ResConfigFlags {
} }
private short getNaturalSdkVersionRequirement() { private short getNaturalSdkVersionRequirement() {
if ((uiMode & MASK_UI_MODE_TYPE) == UI_MODE_TYPE_VR_HEADSET || (colorimetry & COLOR_WIDE_MASK) != 0 || ((colorimetry & COLOR_HDR_MASK) != 0)) { if ((uiMode & MASK_UI_MODE_TYPE) == UI_MODE_TYPE_VR_HEADSET || (colorMode & COLOR_WIDE_MASK) != 0 || ((colorMode & COLOR_HDR_MASK) != 0)) {
return SDK_OREO; return SDK_OREO;
} }
if ((screenLayout2 & MASK_SCREENROUND) != 0) { if ((screenLayout2 & MASK_SCREENROUND) != 0) {

6
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
View File

@ -386,10 +386,10 @@ public class ARSCDecoder {
} }
byte screenLayout2 = 0; byte screenLayout2 = 0;
byte colorimetry = 0; byte colorMode = 0;
if (size >= 52) { if (size >= 52) {
screenLayout2 = mIn.readByte(); screenLayout2 = mIn.readByte();
colorimetry = mIn.readByte(); colorMode = mIn.readByte();
mIn.skipBytes(2); // reserved padding mIn.skipBytes(2); // reserved padding
read = 52; read = 52;
} }
@ -427,7 +427,7 @@ public class ARSCDecoder {
inputFlags, screenWidth, screenHeight, sdkVersion, inputFlags, screenWidth, screenHeight, sdkVersion,
screenLayout, uiMode, smallestScreenWidthDp, screenWidthDp, screenLayout, uiMode, smallestScreenWidthDp, screenWidthDp,
screenHeightDp, localeScript, localeVariant, screenLayout2, screenHeightDp, localeScript, localeVariant, screenLayout2,
colorimetry,isInvalid, size); colorMode, isInvalid, size);
} }
private char[] unpackLanguageOrRegion(byte in0, byte in1, char base) throws AndrolibException { private char[] unpackLanguageOrRegion(byte in0, byte in1, char base) throws AndrolibException {