aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-11-19 02:08:54 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-11-19 02:08:54 +0000
commitfe31a5ed3761199e711f79feba567219d22fe41f (patch)
tree5826531e1d7e8cc04a7e9a20dc4c33cd07bf987e
parent514a0095c65185786202d1ec47b0faf0bd2bb474 (diff)
parentb428cd829fec281b1c3ac3815591b63c2a71a876 (diff)
downloadcuttlefish-fe31a5ed3761199e711f79feba567219d22fe41f.tar.gz
Snap for 9311025 from b428cd829fec281b1c3ac3815591b63c2a71a876 to tm-qpr2-release
Change-Id: I52da4ac37aa22c4567645bcf02aa60b251dd3266
-rw-r--r--shared/foldable/device_state_configuration.xml7
-rw-r--r--shared/foldable/display_layout_configuration.xml13
-rw-r--r--shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml2
3 files changed, 21 insertions, 1 deletions
diff --git a/shared/foldable/device_state_configuration.xml b/shared/foldable/device_state_configuration.xml
index 9618b117f..877a58303 100644
--- a/shared/foldable/device_state_configuration.xml
+++ b/shared/foldable/device_state_configuration.xml
@@ -34,4 +34,11 @@
</lid-switch>
</conditions>
</device-state>
+ <device-state>
+ <identifier>3</identifier>
+ <name>REAR_DISPLAY_MODE</name>
+ <flags>
+ <flag>FLAG_EMULATED_ONLY</flag>
+ </flags>
+ </device-state>
</device-state-config>
diff --git a/shared/foldable/display_layout_configuration.xml b/shared/foldable/display_layout_configuration.xml
index 54b76b1b5..2c50e76ba 100644
--- a/shared/foldable/display_layout_configuration.xml
+++ b/shared/foldable/display_layout_configuration.xml
@@ -38,4 +38,17 @@
<address>4619827551948147201</address>
</display>
</layout>
+
+ <layout>
+ <!-- REAR_DISPLAY_MODE: display0 disabled, display1 enabled -->
+ <state>3</state>
+
+ <display enabled="false">
+ <address>4619827259835644672</address>
+ </display>
+
+ <display enabled="true" defaultDisplay="true">
+ <address>4619827551948147201</address>
+ </display>
+ </layout>
</layouts>
diff --git a/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml b/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml
index c93ab5afa..85b6cadb8 100644
--- a/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shared/foldable/overlay/frameworks/base/core/res/res/values/config.xml
@@ -49,5 +49,5 @@
<!-- Device state that corresponds to rear display mode, feature provided
through Jetpack WindowManager -->
- <integer name="config_deviceStateRearDisplay">0</integer>
+ <integer name="config_deviceStateRearDisplay">3</integer>
</resources>