Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99369100 authored Apr 17, 2025 by Lingyu Feng Committed by Android (Google) Code Review Apr 17, 2025

Merge "Add a setting for "Include default display in topology" switch" into main

parents a60166c5 8af35ec6

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -10249,6 +10249,15 @@ public final class Settings {
		*/
		public static final String MIRROR_BUILT_IN_DISPLAY = "mirror_built_in_display";

		/**
		* Whether to include the default display in the display topology.
		*
		* Note that this value is used for projected mode.
		* @hide
		*/
		public static final String INCLUDE_DEFAULT_DISPLAY_IN_TOPOLOGY =
		"include_default_display_in_topology";

		/**
		* No mode switching will happen.
		*

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -106,6 +106,7 @@ public class SecureSettings {
		Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
		Settings.Secure.MINIMAL_POST_PROCESSING_ALLOWED,
		Settings.Secure.MIRROR_BUILT_IN_DISPLAY,
		Settings.Secure.INCLUDE_DEFAULT_DISPLAY_IN_TOPOLOGY,
		Settings.Secure.MATCH_CONTENT_FRAME_RATE,
		Settings.Secure.NIGHT_DISPLAY_CUSTOM_START_TIME,
		Settings.Secure.NIGHT_DISPLAY_CUSTOM_END_TIME,

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ public class SecureSettingsValidators {
		new DiscreteValueValidator(new String[] {"1", "2"}));
		VALIDATORS.put(Secure.MINIMAL_POST_PROCESSING_ALLOWED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.MIRROR_BUILT_IN_DISPLAY, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.INCLUDE_DEFAULT_DISPLAY_IN_TOPOLOGY, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Secure.MATCH_CONTENT_FRAME_RATE,
		new DiscreteValueValidator(new String[] {"0", "1", "2"}));