Merge "Only backup rotation and density ratio in display window settings." into main (980bd747) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayWindowSettingsXmlHelper.java

+52 −48

Original line number	Diff line number	Diff line
		@@ -90,9 +90,7 @@ class DisplayWindowSettingsXmlHelper {

		out.startTag(null, "display");
		out.attribute(null, "name", displayIdentifier);
		if (settingsEntry.mWindowingMode != WindowConfiguration.WINDOWING_MODE_UNDEFINED) {
		out.attributeInt(null, "windowingMode", settingsEntry.mWindowingMode);
		}

		if (settingsEntry.mUserRotationMode != null) {
		out.attributeInt(null, "userRotationMode",
		settingsEntry.mUserRotationMode);
		@@ -101,24 +99,29 @@ class DisplayWindowSettingsXmlHelper {
		out.attributeInt(null, "userRotation",
		settingsEntry.mUserRotation);
		}
		if (settingsEntry.mForcedWidth != 0 && settingsEntry.mForcedHeight != 0
		&& !forBackup) {
		if (settingsEntry.mForcedDensityRatio != 0.0f) {
		out.attributeFloat(null, "forcedDensityRatio",
		settingsEntry.mForcedDensityRatio);
		}
		if (!forBackup) {
		if (settingsEntry.mWindowingMode
		!= WindowConfiguration.WINDOWING_MODE_UNDEFINED) {
		out.attributeInt(null, "windowingMode", settingsEntry.mWindowingMode);
		}
		if (settingsEntry.mForcedWidth != 0 && settingsEntry.mForcedHeight != 0) {
		out.attributeInt(null, "forcedWidth", settingsEntry.mForcedWidth);
		out.attributeInt(null, "forcedHeight", settingsEntry.mForcedHeight);
		}
		if (settingsEntry.mForcedDensity != 0 && !forBackup) {
		if (settingsEntry.mForcedDensity != 0) {
		out.attributeInt(null, "forcedDensity", settingsEntry.mForcedDensity);
		}
		if (settingsEntry.mForcedDensityRatio != 0.0f) {
		out.attributeFloat(null, "forcedDensityRatio",
		settingsEntry.mForcedDensityRatio);
		}
		if (settingsEntry.mForcedScalingMode != null) {
		out.attributeInt(null, "forcedScalingMode",
		settingsEntry.mForcedScalingMode);
		}
		if (settingsEntry.mRemoveContentMode != REMOVE_CONTENT_MODE_UNDEFINED) {
		out.attributeInt(null, "removeContentMode", settingsEntry.mRemoveContentMode);
		out.attributeInt(null, "removeContentMode",
		settingsEntry.mRemoveContentMode);
		}
		if (settingsEntry.mShouldShowWithInsecureKeyguard != null) {
		out.attributeBoolean(null, "shouldShowWithInsecureKeyguard",
		@@ -151,6 +154,7 @@ class DisplayWindowSettingsXmlHelper {
		out.attributeBoolean(null, "isHomeSupported",
		settingsEntry.mIsHomeSupported);
		}
		}
		out.endTag(null, "display");
		}

services/tests/wmtests/src/com/android/server/wm/DisplayWindowSettingsXmlHelperTests.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -139,20 +139,9 @@ public class DisplayWindowSettingsXmlHelperTests {
		data.mIdentifierType = 1;

		SettingsEntry entry = new SettingsEntry();
		entry.mWindowingMode = 0;
		entry.mUserRotationMode = 0;
		entry.mUserRotation = 0;
		entry.mForcedDensityRatio = 1.2f;
		entry.mForcedScalingMode = 0;
		entry.mRemoveContentMode = 0;
		entry.mShouldShowWithInsecureKeyguard = true;
		entry.mShouldShowSystemDecors = false;
		entry.mImePolicy = 2;
		entry.mFixedToUserRotation = 2;
		entry.mIgnoreOrientationRequest = true;
		entry.mIgnoreDisplayCutout = false;
		entry.mDontMoveToTop = true;
		entry.mIsHomeSupported = false;

		data.mSettings.put(DISPLAY_NAME, entry);
		return data;