Add display configuration file for flame
Bug: 148571883
Change-Id: Iebdd3ea8db640cca6b2da91e5c131b3ebe3ec3f7
(cherry picked from commit aeb6ba488fdefa0bcee3251196135a374ae4da98)
diff --git a/device-coral.mk b/device-coral.mk
index d0040ba..f2d9fbb 100644
--- a/device-coral.mk
+++ b/device-coral.mk
@@ -27,3 +27,7 @@
# Bluetooth Tx power caps for coral
PRODUCT_COPY_FILES += \
vendor/google/services/GoogleRil/native/qc/bluetooth_power_limits_coral.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
+
+# Display config
+PRODUCT_COPY_FILES += \
+ device/google/coral/displayconfig/display_19260504575090817.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/displayconfig/display_19260504575090817.xml
diff --git a/device-flame.mk b/device-flame.mk
index 8a97b4a..11608af 100644
--- a/device-flame.mk
+++ b/device-flame.mk
@@ -28,4 +28,8 @@
PRODUCT_COPY_FILES += \
vendor/google/services/GoogleRil/native/qc/bluetooth_power_limits_flame.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
+# Display config
+PRODUCT_COPY_FILES += \
+ device/google/coral/displayconfig/display_19261132550654593.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/displayconfig/display_19261132550654593.xml
+
PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.height_ratio=1.2
diff --git a/device.mk b/device.mk
index bb29e29..3bcc5f7 100644
--- a/device.mk
+++ b/device.mk
@@ -54,8 +54,7 @@
device/google/coral/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \
device/google/coral/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
- frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.software.verified_boot.xml \
- device/google/coral/displayconfig/display_19260504575090817.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/displayconfig/display_19260504575090817.xml
+ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.software.verified_boot.xml
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/displayconfig/display_19261132550654593.xml b/displayconfig/display_19261132550654593.xml
new file mode 100644
index 0000000..705fe40
--- /dev/null
+++ b/displayconfig/display_19261132550654593.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+
+<!-- Copyright (C) 2020 Google Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<displayConfiguration>
+ <screenBrightnessMap>
+ <point>
+ <value>0.0</value>
+ <nits>2.0</nits>
+ </point>
+ <point>
+ <value>1.0</value>
+ <nits>450.0</nits>
+ </point>
+ </screenBrightnessMap>
+</displayConfiguration>
