Merge "Add Shade display awareness dev option" into main (cf06953c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -13709,6 +13709,14 @@ public final class Settings {
		public static final String DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR =
		"render_shadows_in_compositor";

		/**
		* Policy to be used for the display shade when connected to an external display.
		* @hide
		*/
		@Readable
		public static final String DEVELOPMENT_SHADE_DISPLAY_AWARENESS =
		"shade_display_awareness";

		/**
		* Path to the WindowManager display settings file. If unset, the default file path will
		* be used.

+21 −0

Original line number	Diff line number	Diff line
		@@ -667,4 +667,25 @@
		<item>3</item>
		</string-array>

		<!-- Options for showing shade on external display for developers -->
		<string-array name="shade_display_awareness_entries" >
		<item>Device display only (Default)</item>
		<item>External display</item>
		<item>Focus-based</item>
		</string-array>

		<!-- Options for showing shade on external display for developers -->
		<string-array name="shade_display_awareness_summaries" >
		<item>Show shade on device display only </item>
		<item>Show device on single external display</item>
		<item>Show device on last focused display</item>
		</string-array>

		<!-- Values for showing shade on external display for developers -->
		<string-array name="shade_display_awareness_values" >
		<item>device-display</item>
		<item>external-display</item>
		<item>focus-based</item>
		</string-array>

		</resources>

+3 −0

Original line number	Diff line number	Diff line
		@@ -990,6 +990,9 @@
		<!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=45] -->
		<string name="overlay_display_devices_title">Simulate secondary displays</string>

		<!-- UI debug setting: shade display awareness title [CHAR LIMIT=45] -->
		<string name="shade_display_awareness_title">Shade display position</string>

		<!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
		<string name="debug_applications_category">Apps</string>

+1 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,7 @@ public class SettingsBackupTest {
		Settings.Global.DEVELOPMENT_FORCE_RTL,
		Settings.Global.DEVELOPMENT_ENABLE_NON_RESIZABLE_MULTI_WINDOW,
		Settings.Global.DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR,
		Settings.Global.DEVELOPMENT_SHADE_DISPLAY_AWARENESS,
		Settings.Global.DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH,
		Settings.Global.DEVICE_DEMO_MODE,
		Settings.Global.DEVICE_IDLE_CONSTANTS,