Merge "Fix widecg and hdr ordering in Configuration" (c803806e) · Commits · e / os / android_frameworks_base

core/java/android/content/res/Configuration.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -2076,23 +2076,23 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		break;
		}

		switch (config.colorMode & Configuration.COLOR_MODE_HDR_MASK) {
		case Configuration.COLOR_MODE_HDR_YES:
		parts.add("highdr");
		switch (config.colorMode & Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_MASK) {
		case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES:
		parts.add("widecg");
		break;
		case Configuration.COLOR_MODE_HDR_NO:
		parts.add("lowdr");
		case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO:
		parts.add("nowidecg");
		break;
		default:
		break;
		}

		switch (config.colorMode & Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_MASK) {
		case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES:
		parts.add("widecg");
		switch (config.colorMode & Configuration.COLOR_MODE_HDR_MASK) {
		case Configuration.COLOR_MODE_HDR_YES:
		parts.add("highdr");
		break;
		case Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO:
		parts.add("nowidecg");
		case Configuration.COLOR_MODE_HDR_NO:
		parts.add("lowdr");
		break;
		default:
		break;

+14 −14

Original line number	Diff line number	Diff line
		@@ -3205,20 +3205,6 @@ String8 ResTable_config::toString() const {
		break;
		}
		}
		if ((colorMode&MASK_HDR) != 0) {
		if (res.size() > 0) res.append("-");
		switch (colorMode&MASK_HDR) {
		case ResTable_config::HDR_NO:
		res.append("lowdr");
		break;
		case ResTable_config::HDR_YES:
		res.append("highdr");
		break;
		default:
		res.appendFormat("hdr=%d", dtohs(colorMode&MASK_HDR));
		break;
		}
		}
		if ((colorMode&MASK_WIDE_COLOR_GAMUT) != 0) {
		if (res.size() > 0) res.append("-");
		switch (colorMode&MASK_WIDE_COLOR_GAMUT) {
		@@ -3233,6 +3219,20 @@ String8 ResTable_config::toString() const {
		break;
		}
		}
		if ((colorMode&MASK_HDR) != 0) {
		if (res.size() > 0) res.append("-");
		switch (colorMode&MASK_HDR) {
		case ResTable_config::HDR_NO:
		res.append("lowdr");
		break;
		case ResTable_config::HDR_YES:
		res.append("highdr");
		break;
		default:
		res.appendFormat("hdr=%d", dtohs(colorMode&MASK_HDR));
		break;
		}
		}
		if (orientation != ORIENTATION_ANY) {
		if (res.size() > 0) res.append("-");
		switch (orientation) {