diff options
| author | Darryl L Johnson <darryljohnson@google.com> | 2020-11-18 14:13:27 -0800 |
|---|---|---|
| committer | Darryl L Johnson <darryljohnson@google.com> | 2020-12-01 14:53:12 -0800 |
| commit | 377f357c53109cd353f8350e38f52097f15cd688 (patch) | |
| tree | f80f2950b2dcb0f6a92ab6fbeffba7d39ed6954b /packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | |
| parent | c36d7b0fb43db69af0ef68e3ea734a9ee2d5ba45 (diff) | |
Allow toggling the location that display settings are read from.
DisplayWindowSettingsProvider currently only supports reading display
window settings from a single file location. However, this doesn't
support the use case where a device may want to ship with multiple
vendor display setting experiences and allow switching between them at
runtime.
This updates DisplayWindowSettingsProvider to allow overriding the file
path that's used to read display settings. The default is still to read
from the main settings file stored at /vendor/etc/display_settings.xml
but can be changed by setting the global setting:
DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH.
This also removes the flag DEVELOPMENT_IGNORE_VENDOR_DISPLAY_SETTINGS to
since ignoring vendor display settings entirely is no longer needed.
Test: atest WindowManagerSettingsTests
Test: atest DisplayWindowSettingsProviderTests
Bug: 172342357
Bug: 173540615
Change-Id: I11fd2945a4dacef80e1ab921d585c712f20ae55b
Diffstat (limited to 'packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java')
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 48c0dc4fb2b8..75eea8db8085 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -230,7 +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.DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH, Settings.Global.DEVICE_DEMO_MODE, Settings.Global.BATTERY_SAVER_ADAPTIVE_CONSTANTS, Settings.Global.BATTERY_SAVER_CONSTANTS, |