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

Commit 51049735 authored Nov 03, 2020 by Darryl Johnson Committed by Android (Google) Code Review Nov 03, 2020

Merge changes from topic "vendor-display-settings"

* changes:
  Add global development setting to enable/disable vendor display settings. (2/n)
  Seperate out DisplayWindowSettings persistence from retreival/policy logic. (1/n)

parents 8c768434 7bbe64f9

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -9773,6 +9773,14 @@ public final class Settings {
		public static final String DEVELOPMENT_USE_BLAST_ADAPTER_SV =
		"use_blast_adapter_sv";

		/**
		* If {@code true}, vendor provided window manager display settings will be ignored.
		* (0 = false, 1 = true)
		* @hide
		*/
		public static final String DEVELOPMENT_IGNORE_VENDOR_DISPLAY_SETTINGS =
		"ignore_vendor_display_settings";

		/**
		* Whether user has enabled development settings.
		*/

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ public class SettingsBackupTest {
		Settings.Global.DEVELOPMENT_RENDER_SHADOWS_IN_COMPOSITOR,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_SV,
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR,
		Settings.Global.DEVELOPMENT_IGNORE_VENDOR_DISPLAY_SETTINGS,
		Settings.Global.DEVICE_DEMO_MODE,
		Settings.Global.BATTERY_SAVER_ADAPTIVE_CONSTANTS,
		Settings.Global.BATTERY_SAVER_CONSTANTS,

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

+346 −499

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644

+549 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+30 −2

File changed.

Preview size limit exceeded, changes collapsed.