summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChris Li <lihongyu@google.com>2020-04-20 22:39:53 -0700
committerChris Li <lihongyu@google.com>2020-04-29 11:44:27 -0700
commit1ac23bbf925da05a8bbc43ecf37dd67e702c7853 (patch)
treee7ab6ea9df0182210b756f0a930058da306e06c5 /core/java/android
parent2b49f81e7ec30cea92167c2352d45c568fdcf24f (diff)
Allow Overlay Display to take display flags
Before, CTS test used WindowManager#shouldShowSystemDecors() to set show system decorations after overlay display launched, which wouldn't enable system decorations without relaunching. Now, we can set those flag before display launch similar to what VirtualDisplayHelper does. Bug: 153624902 Bug: 154158053 Test: atest CtsWindowManagerDeviceTestCases:MultiDisplayClientTests Test: atest CtsWindowManagerDeviceTestCases:MultiDisplaySystemDecorationTests Change-Id: I83c21a74c722a23ac77141305a08d9f67c5bbcf0
Diffstat (limited to 'core/java/android')
-rwxr-xr-xcore/java/android/provider/Settings.java26
1 files changed, 23 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 78b0910ad01a..b280c5d63cd7 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10737,13 +10737,33 @@ public final class Settings {
* The associated value is a specially formatted string that describes the
* size and density of simulated secondary display devices.
* <p>
- * Format: {width}x{height}/{dpi};...
+ * Format:
+ * <pre>
+ * [display1];[display2];...
+ * </pre>
+ * with each display specified as:
+ * <pre>
+ * [mode1]|[mode2]|...,[flag1],[flag2],...
+ * </pre>
+ * with each mode specified as:
+ * <pre>
+ * [width]x[height]/[densityDpi]
+ * </pre>
+ * Supported flags:
+ * <ul>
+ * <li><pre>secure</pre>: creates a secure display</li>
+ * <li><pre>own_content_only</pre>: only shows this display's own content</li>
+ * <li><pre>should_show_system_decorations</pre>: supports system decorations</li>
+ * </ul>
* </p><p>
* Example:
* <ul>
* <li><code>1280x720/213</code>: make one overlay that is 1280x720 at 213dpi.</li>
- * <li><code>1920x1080/320;1280x720/213</code>: make two overlays, the first
- * at 1080p and the second at 720p.</li>
+ * <li><code>1920x1080/320,secure;1280x720/213</code>: make two overlays, the first at
+ * 1080p and secure; the second at 720p.</li>
+ * <li><code>1920x1080/320|3840x2160/640</code>: make one overlay that is 1920x1080 at
+ * 213dpi by default, but can also be upscaled to 3840x2160 at 640dpi by the system if the
+ * display device allows.</li>
* <li>If the value is empty, then no overlay display devices are created.</li>
* </ul></p>
*