Merge Android 12
Bug: 202323961
Merged-In: If7fe58903c358f41b0ce8ea2bb8dfc198b5d443d
Change-Id: I9590521a5812d9f15badef793991c4c4a85809ff
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index ae396fd..1601081 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,7 +19,9 @@
$(LOCAL_DIR)/aosp_blueline.mk \
$(LOCAL_DIR)/aosp_crosshatch_hwasan.mk \
$(LOCAL_DIR)/aosp_blueline_hwasan.mk \
+ $(LOCAL_DIR)/vf/aosp_crosshatch_vf.mk \
COMMON_LUNCH_CHOICES := \
aosp_crosshatch-userdebug \
- aosp_blueline-userdebug
+ aosp_blueline-userdebug \
+ aosp_crosshatch_vf-userdebug \
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 8d8688c..33d60b2 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -68,11 +68,16 @@
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS += \
- boot \
system \
- vbmeta \
dtbo
+ifneq ($(PRODUCT_BUILD_BOOT_IMAGE),false)
+AB_OTA_PARTITIONS += boot
+endif
+ifneq ($(PRODUCT_BUILD_VBMETA_IMAGE),false)
+AB_OTA_PARTITIONS += vbmeta
+endif
+
# Skip product and system_ext partition for nodap build
ifeq ($(filter %_nodap,$(TARGET_PRODUCT)),)
AB_OTA_PARTITIONS += \
@@ -298,6 +303,10 @@
else ifeq (,$(filter-out blueline_kernel_debug_memory crosshatch_kernel_debug_memory, $(TARGET_PRODUCT)))
BOARD_VENDOR_KERNEL_MODULES += \
$(wildcard device/google/crosshatch-kernel/debug_memory/*.ko)
+else ifeq (,$(filter-out blueline_kernel_debug_memory_accounting crosshatch_kernel_debug_memory_accounting, $(TARGET_PRODUCT)))
+BOARD_VENDOR_KERNEL_MODULES += \
+ $(wildcard device/google/crosshatch-kernel/debug_memory_accounting/*.ko)
+BOARD_KERNEL_CMDLINE += page_owner=on
else ifeq (,$(filter-out blueline_kernel_debug_locking crosshatch_kernel_debug_locking, $(TARGET_PRODUCT)))
BOARD_VENDOR_KERNEL_MODULES += \
$(wildcard device/google/crosshatch-kernel/debug_locking/*.ko)
@@ -328,6 +337,8 @@
BOARD_PREBUILT_DTBIMAGE_DIR := device/google/crosshatch-kernel/kasan
else ifeq (,$(filter-out blueline_kernel_debug_memory crosshatch_kernel_debug_memory, $(TARGET_PRODUCT)))
BOARD_PREBUILT_DTBIMAGE_DIR := device/google/crosshatch-kernel/debug_memory
+else ifeq (,$(filter-out blueline_kernel_debug_memory_accounting crosshatch_kernel_debug_memory_accounting, $(TARGET_PRODUCT)))
+BOARD_PREBUILT_DTBIMAGE_DIR := device/google/crosshatch-kernel/debug_memory_accounting
else ifeq (,$(filter-out blueline_kernel_debug_locking crosshatch_kernel_debug_locking, $(TARGET_PRODUCT)))
BOARD_PREBUILT_DTBIMAGE_DIR := device/google/crosshatch-kernel/debug_locking
else ifeq (,$(filter-out blueline_kernel_debug_hang crosshatch_kernel_debug_hang, $(TARGET_PRODUCT)))
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 70ec95f..126fcea 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -168,10 +168,10 @@
# Use stable aidl power HAL
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power@1.3-service.pixel-libperfmgr.rc)
-# Update to USB HAL 1.2
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.1-service.crosshatch)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.1-service.crosshatch.rc)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.1-service.crosshatch.xml)
+# Update to USB HAL 1.3
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.2-service.crosshatch)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.2-service.crosshatch.rc)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.2-service.crosshatch.xml)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.usb@1.3-service.crosshatch)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.usb@1.3-service.crosshatch.rc)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.usb@1.3-service.crosshatch.xml)
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index 2e351a5..3b11846 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -601,7 +601,7 @@
#gAPCntryCode=USI
# DFS Master Capability
-gEnableDFSMasterCap=1
+gEnableDFSMasterCap=0
#Auto Shutdown Value in seconds. A value of 0 means Auto shutoff is disabled
gAPAutoShutOff=0
diff --git a/aosp_crosshatch.mk b/aosp_crosshatch.mk
index 5195091..6e8dacc 100644
--- a/aosp_crosshatch.mk
+++ b/aosp_crosshatch.mk
@@ -44,6 +44,9 @@
$(call inherit-product, device/google/crosshatch/device-crosshatch.mk)
$(call inherit-product-if-exists, vendor/google_devices/crosshatch/proprietary/device-vendor.mk)
+PRODUCT_SOONG_NAMESPACES += \
+ vendor/google_devices/crosshatch/proprietary/hardwareinfo
+
PRODUCT_COPY_FILES += $(LOCAL_PATH)/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
# STOPSHIP deal with Qualcomm stuff later
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml
index 595689c..37d69d9 100644
--- a/audio_policy_configuration.xml
+++ b/audio_policy_configuration.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<globalConfiguration speaker_drc_enabled="true"/>
<modules>
@@ -30,11 +30,11 @@
</attachedDevices>
<defaultOutputDevice>Speaker</defaultOutputDevice>
<mixPorts>
- <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">
+ <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW|AUDIO_OUTPUT_FLAG_FAST">
+ <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
@@ -42,72 +42,72 @@
<mixPort name="deep_buffer" role="source"
flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
- samplingRates="44100,48000"
+ samplingRates="44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
- flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+ flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
<profile name="" format="AUDIO_FORMAT_MP3"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_LC"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort>
<mixPort name="voice_tx" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+ <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="voip_rx" role="source"
flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="incall_music_uplink" role="source"
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000"
+ samplingRates="8000 16000 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="hifi_input" role="sink" />
<mixPort name="voice_rx" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+ samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="voip_tx" role="sink"
flags="AUDIO_INPUT_FLAG_VOIP_TX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
</mixPort>
</mixPorts>
<devicePorts>
@@ -132,17 +132,17 @@
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="44100 48000 88200 96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="44100 48000 88200 96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="44100 48000 88200 96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
</devicePort>
@@ -199,9 +199,6 @@
</routes>
</module>
- <!-- A2DP Input Audio HAL -->
- <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
-
<!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0">
<mixPorts>
diff --git a/audio_policy_configuration_a2dp_offload_disabled.xml b/audio_policy_configuration_a2dp_offload_disabled.xml
index 38b267d..1196fc6 100644
--- a/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<globalConfiguration speaker_drc_enabled="true"/>
<modules>
@@ -30,11 +30,11 @@
</attachedDevices>
<defaultOutputDevice>Speaker</defaultOutputDevice>
<mixPorts>
- <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">
+ <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW|AUDIO_OUTPUT_FLAG_FAST">
+ <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
@@ -42,72 +42,72 @@
<mixPort name="deep_buffer" role="source"
flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
- samplingRates="44100,48000"
+ samplingRates="44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
- flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+ flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
<profile name="" format="AUDIO_FORMAT_MP3"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_LC"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort>
<mixPort name="voice_tx" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+ <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="voip_rx" role="source"
flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="incall_music_uplink" role="source"
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000"
+ samplingRates="8000 16000 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="hifi_input" role="sink" />
<mixPort name="voice_rx" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+ samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="voip_tx" role="sink"
flags="AUDIO_INPUT_FLAG_VOIP_TX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
</mixPort>
</mixPorts>
<devicePorts>
@@ -179,7 +179,7 @@
</module>
<!-- A2DP Input Audio HAL -->
- <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
+ <xi:include href="a2dp_in_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0">
@@ -205,7 +205,7 @@
<xi:include href="r_submix_audio_policy_configuration.xml"/>
<!-- Bluetooth Audio HAL -->
- <xi:include href="bluetooth_audio_policy_configuration.xml"/>
+ <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
</modules>
diff --git a/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio_policy_configuration_bluetooth_legacy_hal.xml
index 4945f49..ebf4b63 100644
--- a/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<globalConfiguration speaker_drc_enabled="true"/>
<modules>
@@ -30,11 +30,11 @@
</attachedDevices>
<defaultOutputDevice>Speaker</defaultOutputDevice>
<mixPorts>
- <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">
+ <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW|AUDIO_OUTPUT_FLAG_FAST">
+ <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
@@ -42,72 +42,72 @@
<mixPort name="deep_buffer" role="source"
flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
- samplingRates="44100,48000"
+ samplingRates="44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="compressed_offload" role="source"
- flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+ flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
<profile name="" format="AUDIO_FORMAT_MP3"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_LC"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000 64000 88200 96000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort>
<mixPort name="voice_tx" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
- <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+ <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="voip_rx" role="source"
flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+ samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="incall_music_uplink" role="source"
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000"
+ samplingRates="8000 16000 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST">
<profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="hifi_input" role="sink" />
<mixPort name="voice_rx" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+ samplingRates="8000 16000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
<mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
- channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+ samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK AUDIO_CHANNEL_INDEX_MASK_3"/>
</mixPort>
<mixPort name="voip_tx" role="sink"
flags="AUDIO_INPUT_FLAG_VOIP_TX">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+ samplingRates="8000 16000 32000 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
</mixPort>
</mixPorts>
<devicePorts>
@@ -179,7 +179,7 @@
</module>
<!-- A2DP Audio HAL -->
- <xi:include href="a2dp_audio_policy_configuration.xml"/>
+ <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0">
@@ -205,7 +205,7 @@
<xi:include href="r_submix_audio_policy_configuration.xml"/>
<!-- Hearing aid Audio HAL -->
- <xi:include href="hearing_aid_audio_policy_configuration.xml"/>
+ <xi:include href="hearing_aid_audio_policy_configuration_7_0.xml"/>
</modules>
diff --git a/blueline/BoardConfig.mk b/blueline/BoardConfig.mk
index 0c7d99b..b990896 100644
--- a/blueline/BoardConfig.mk
+++ b/blueline/BoardConfig.mk
@@ -14,8 +14,12 @@
# limitations under the License.
#
-TARGET_BOOTLOADER_BOARD_NAME := blueline
-TARGET_SCREEN_DENSITY := 440
-TARGET_RECOVERY_UI_MARGIN_HEIGHT := 20
+ifdef PHONE_CAR_BOARD_CONFIG
+ include $(PHONE_CAR_BOARD_CONFIG)
+else
+ TARGET_BOOTLOADER_BOARD_NAME := blueline
+ TARGET_SCREEN_DENSITY := 440
+ TARGET_RECOVERY_UI_MARGIN_HEIGHT := 20
-include device/google/crosshatch/BoardConfig-common.mk
+ include device/google/crosshatch/BoardConfig-common.mk
+endif
diff --git a/blueline/overlay/frameworks/base/core/res/res/values/config.xml b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
index 37a77cc..fed7d95 100755
--- a/blueline/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/core/res/res/values/config.xml
@@ -689,6 +689,19 @@
<item>G013B</item>
</string-array>
- <dimen name="rounded_corner_radius">70px</dimen>
+ <!-- Radius of the software rounded corners. -->
+ <dimen name="rounded_corner_radius">48px</dimen>
+ <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
+ <dimen name="rounded_corner_radius_adjustment">0px</dimen>
+
+ <!-- Height of the status bar in portrait. The height should be
+ Max((status bar content height + waterfall top size), top cutout size) -->
+ <dimen name="status_bar_height_portrait">28dp</dimen>
+ <dimen name="status_bar_height_landscape">24dp</dimen>
+
+ <dimen name="quick_qs_offset_height">48dp</dimen>
+
+ <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+ <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
</resources>
diff --git a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index d6df656..cb533d2 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -41,4 +41,6 @@
<item>0</item> <!-- 3: HIGH -->
<item>0</item> <!-- 4: SUN -->
</integer-array>
+
+ <bool name="config_roundedCornerMultipleRadius">false</bool>
</resources>
diff --git a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 3401516..f5d26be 100644
--- a/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/blueline/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -17,4 +17,20 @@
-->
<resources>
<dimen name="rounded_corner_content_padding">28px</dimen>
+
+ <!-- the padding on the top of the statusbar (usually 0) -->
+ <dimen name="status_bar_padding_top">1px</dimen>
+
+ <!-- Location on the screen of the center of the physical power button. -->
+ <dimen name="physical_power_button_center_screen_location_y">450px</dimen>
+
+ <!-- Location on the screen of the center of the physical volume up/down buttons. -->
+ <dimen name="physical_volume_up_button_center_screen_location_y">780px</dimen>
+ <dimen name="physical_volume_down_button_center_screen_location_y">980px</dimen>
+
+ <!-- Location on the screen of the center of the fingerprint sensor. For devices with under
+ display fingerprint sensors, this directly corresponds to the fingerprint sensor's location.
+ For devices with sensors on the back of the device, this corresponds to the location on the
+ screen directly in front of the sensor. -->
+ <dimen name="physical_fingerprint_sensor_center_screen_location_y">450px</dimen>
</resources>
diff --git a/bluetooth_hearing_aid_audio_policy_configuration.xml b/bluetooth_hearing_aid_audio_policy_configuration.xml
index 7dcabf7..e275d6a 100644
--- a/bluetooth_hearing_aid_audio_policy_configuration.xml
+++ b/bluetooth_hearing_aid_audio_policy_configuration.xml
@@ -5,7 +5,7 @@
<!-- Hearing AIDs Audio Ports -->
<mixPort name="hearing aid output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
- samplingRates="24000,16000"
+ samplingRates="24000 16000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
</mixPorts>
diff --git a/component-overrides.xml b/component-overrides.xml
index bb3419d..f5baa00 100644
--- a/component-overrides.xml
+++ b/component-overrides.xml
@@ -17,4 +17,7 @@
<component-override package="com.android.bluetooth" >
<component class=".sap.SapService" enabled="true" />
</component-override>
-</config>
\ No newline at end of file
+ <component-override package="com.google.android.apps.tips" >
+ <component class=".TipsMain" enabled="false" />
+ </component-override>
+</config>
diff --git a/crosshatch/BoardConfig.mk b/crosshatch/BoardConfig.mk
index b105aa9..828afd9 100644
--- a/crosshatch/BoardConfig.mk
+++ b/crosshatch/BoardConfig.mk
@@ -14,8 +14,12 @@
# limitations under the License.
#
-TARGET_BOOTLOADER_BOARD_NAME := crosshatch
-TARGET_SCREEN_DENSITY := 560
-TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
+ifdef PHONE_CAR_BOARD_CONFIG
+ include $(PHONE_CAR_BOARD_CONFIG)
+else
+ TARGET_BOOTLOADER_BOARD_NAME := crosshatch
+ TARGET_SCREEN_DENSITY := 560
+ TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165
-include device/google/crosshatch/BoardConfig-common.mk
+ include device/google/crosshatch/BoardConfig-common.mk
+endif
diff --git a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 17be0a1..1d98cf9 100644
--- a/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/crosshatch/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -29,4 +29,16 @@
<!-- end margin for multi user switch in collapsed quick settings -->
<dimen name="multi_user_switch_keyguard_margin">7dp</dimen>
+ <!-- Location on the screen of the center of the physical power button. -->
+ <dimen name="physical_power_button_center_screen_location_y">780px</dimen>
+
+ <!-- Location on the screen of the center of the physical volume up/down buttons. -->
+ <dimen name="physical_volume_up_button_center_screen_location_y">1180px</dimen>
+ <dimen name="physical_volume_down_button_center_screen_location_y">1380px</dimen>
+
+ <!-- Location on the screen of the center of the fingerprint sensor. For devices with under
+ display fingerprint sensors, this directly corresponds to the fingerprint sensor's location.
+ For devices with sensors on the back of the device, this corresponds to the location on the
+ screen directly in front of the sensor. -->
+ <dimen name="physical_fingerprint_sensor_center_screen_location_y">780px</dimen>
</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk
deleted file mode 100644
index f326820..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := DisplayCutoutNoCutout
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := NoCutoutOverlay
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml
deleted file mode 100644
index e215b3f..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.internal.display.cutout.emulation.noCutout"
- android:versionCode="1"
- android:versionName="1.0">
- <overlay android:targetPackage="android"
- android:category="com.android.internal.display_cutout_emulation"
- android:priority="0"/>
-
- <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
-</manifest>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-af/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-af/strings.xml
deleted file mode 100644
index 65a0e81..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-af/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Versteek"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-am/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-am/strings.xml
deleted file mode 100644
index 8b0c212..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-am/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ደብቅ"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ar/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ar/strings.xml
deleted file mode 100644
index e42e0ce..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ar/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"إخفاء"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-as/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-as/strings.xml
deleted file mode 100644
index 57df712..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-as/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"লুকুৱাওক"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-az/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-az/strings.xml
deleted file mode 100644
index 03d109d..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-az/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Gizlədin"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-b+sr+Latn/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-b+sr+Latn/strings.xml
deleted file mode 100644
index d970479..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-b+sr+Latn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Sakrij"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-be/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-be/strings.xml
deleted file mode 100644
index c83f504..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-be/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Схаваць"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bg/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bg/strings.xml
deleted file mode 100644
index 0594ee2..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bg/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Скриване"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bn/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bn/strings.xml
deleted file mode 100644
index c763683..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"লুকান"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bs/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bs/strings.xml
deleted file mode 100644
index d970479..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-bs/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Sakrij"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ca/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ca/strings.xml
deleted file mode 100644
index 079d52d..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ca/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Amaga"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-cs/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-cs/strings.xml
deleted file mode 100644
index 77282f1..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-cs/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Skrýt"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-da/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-da/strings.xml
deleted file mode 100644
index 98d18a5..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-da/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Skjul"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-de/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-de/strings.xml
deleted file mode 100644
index af5887a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-de/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ausblenden"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-el/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-el/strings.xml
deleted file mode 100644
index 8fd6d44..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-el/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Απόκρυψη"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rAU/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rAU/strings.xml
deleted file mode 100644
index 9e227b6..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rAU/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Hide"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rCA/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rCA/strings.xml
deleted file mode 100644
index 9e227b6..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rCA/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Hide"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rGB/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rGB/strings.xml
deleted file mode 100644
index 9e227b6..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Hide"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rIN/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rIN/strings.xml
deleted file mode 100644
index 9e227b6..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Hide"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rXC/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rXC/strings.xml
deleted file mode 100644
index bb60499..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-en-rXC/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Hide"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-es-rUS/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-es-rUS/strings.xml
deleted file mode 100644
index 58ca55a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ocultar"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-es/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-es/strings.xml
deleted file mode 100644
index 58ca55a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-es/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ocultar"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-et/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-et/strings.xml
deleted file mode 100644
index ca4aca2..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-et/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Peida"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-eu/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-eu/strings.xml
deleted file mode 100644
index 9e36f3b..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-eu/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ezkutatu"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fa/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fa/strings.xml
deleted file mode 100644
index e9bfd75..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fa/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"پنهان کردن"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fi/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fi/strings.xml
deleted file mode 100644
index 823f370..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Piilota"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fr-rCA/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 4bde836..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Masquer"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fr/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fr/strings.xml
deleted file mode 100644
index 4bde836..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-fr/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Masquer"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-gl/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-gl/strings.xml
deleted file mode 100644
index 58ca55a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-gl/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ocultar"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-gu/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-gu/strings.xml
deleted file mode 100644
index 437441c..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-gu/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"છુપાવો"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hi/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hi/strings.xml
deleted file mode 100644
index 711c31d..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"डिसप्ले कटआउट को छिपाएं"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hr/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hr/strings.xml
deleted file mode 100644
index d970479..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hr/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Sakrij"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hu/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hu/strings.xml
deleted file mode 100644
index ffd6812..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hu/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Elrejtés"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hy/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hy/strings.xml
deleted file mode 100644
index 094686e..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-hy/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Թաքցնել"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-in/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-in/strings.xml
deleted file mode 100644
index eace0cf..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-in/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Sembunyikan"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-is/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-is/strings.xml
deleted file mode 100644
index 0d102f2..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-is/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Fela"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-it/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-it/strings.xml
deleted file mode 100644
index c7c6e8d..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-it/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Nascondi"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-iw/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-iw/strings.xml
deleted file mode 100644
index 2f3cae0..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-iw/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"הסתרה"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ja/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ja/strings.xml
deleted file mode 100644
index 079dce8..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ja/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"非表示"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ka/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ka/strings.xml
deleted file mode 100644
index 7744415..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ka/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"დამალვა"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-kk/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-kk/strings.xml
deleted file mode 100644
index 497e6e5..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-kk/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Жасыру"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-km/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-km/strings.xml
deleted file mode 100644
index addea0e..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-km/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"លាក់"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-kn/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-kn/strings.xml
deleted file mode 100644
index 7353419..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-kn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ಮರೆಮಾಡಿ"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ko/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ko/strings.xml
deleted file mode 100644
index 2e25f42..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ko/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"숨기기"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ky/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ky/strings.xml
deleted file mode 100644
index 85f55bd..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ky/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Жашыруу"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lo/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lo/strings.xml
deleted file mode 100644
index f9c8a71..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lo/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ເຊື່ອງ"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lt/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lt/strings.xml
deleted file mode 100644
index 5ac46ed..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lt/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Slėpti"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lv/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lv/strings.xml
deleted file mode 100644
index 09fbde6..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-lv/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Paslēpt"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mk/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mk/strings.xml
deleted file mode 100644
index 5db59dd..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mk/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Сокриј"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ml/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ml/strings.xml
deleted file mode 100644
index 0cd9dfd..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ml/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"അദൃശ്യമാക്കുക"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mn/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mn/strings.xml
deleted file mode 100644
index c775ea3..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mn/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Нуух"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mr/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mr/strings.xml
deleted file mode 100644
index 25fe0e4..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-mr/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"लपवा"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ms/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ms/strings.xml
deleted file mode 100644
index eace0cf..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ms/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Sembunyikan"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-my/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-my/strings.xml
deleted file mode 100644
index 72e557b..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-my/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ဝှက်ရန်"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-nb/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-nb/strings.xml
deleted file mode 100644
index 98d18a5..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-nb/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Skjul"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ne/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ne/strings.xml
deleted file mode 100644
index b964f0a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ne/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"लुकाउनुहोस्"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-nl/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-nl/strings.xml
deleted file mode 100644
index 0140cd8..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-nl/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Verbergen"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-or/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-or/strings.xml
deleted file mode 100644
index 62b9b69..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-or/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ଲୁଚାନ୍ତୁ"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pa/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pa/strings.xml
deleted file mode 100644
index 39b8c1b..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pa/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ਲੁਕਾਓ"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pl/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pl/strings.xml
deleted file mode 100644
index b1059ef..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pl/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ukryj"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt-rBR/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 58ca55a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ocultar"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt-rPT/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt-rPT/strings.xml
deleted file mode 100644
index 58ca55a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ocultar"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt/strings.xml
deleted file mode 100644
index 58ca55a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-pt/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ocultar"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ro/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ro/strings.xml
deleted file mode 100644
index 61254b2..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ro/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ascundeți"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ru/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ru/strings.xml
deleted file mode 100644
index 507b87d..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ru/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Скрыть"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-si/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-si/strings.xml
deleted file mode 100644
index d72c1be..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-si/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"සඟවන්න"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sk/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sk/strings.xml
deleted file mode 100644
index d663882..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sk/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Skryť"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sl/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sl/strings.xml
deleted file mode 100644
index 650cc49..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sl/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Skrij"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sq/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sq/strings.xml
deleted file mode 100644
index c210dcd..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sq/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Fshih"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sr/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sr/strings.xml
deleted file mode 100644
index 8843ed8..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sr/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Сакриј"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sv/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sv/strings.xml
deleted file mode 100644
index 9dc5cf0..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sv/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Dölj"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sw/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sw/strings.xml
deleted file mode 100644
index b177c3f..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-sw/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ficha"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ta/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ta/strings.xml
deleted file mode 100644
index 0d16272..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ta/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"மறை"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-te/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-te/strings.xml
deleted file mode 100644
index f826284..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-te/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"దాచు"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-th/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-th/strings.xml
deleted file mode 100644
index beb7361..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-th/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"ซ่อน"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-tl/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-tl/strings.xml
deleted file mode 100644
index 1ab2b80..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-tl/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Itago"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-tr/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-tr/strings.xml
deleted file mode 100644
index 29b9e44..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-tr/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Gizle"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-uk/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-uk/strings.xml
deleted file mode 100644
index 4cb28d9..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-uk/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Сховати"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ur/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ur/strings.xml
deleted file mode 100644
index bbf4e15..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-ur/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"چھپائیں"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-uz/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-uz/strings.xml
deleted file mode 100644
index e7663e9..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-uz/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Berkitish"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-vi/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-vi/strings.xml
deleted file mode 100644
index 0480b9a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-vi/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Ẩn"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rCN/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 0da23f7..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"隐藏"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rHK/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 4eb6b3a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"隱藏"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rTW/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 4eb6b3a..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"隱藏"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zu/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zu/strings.xml
deleted file mode 100644
index c51c9fc..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values-zu/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="139628023533109567">"Fihla"</string>
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml
deleted file mode 100644
index 858df87..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/config.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <!-- Whether the display cutout region of the main built-in display should be forced to
- black in software (to avoid aliasing or emulate a cutout that is not physically existent).
- -->
- <bool name="config_fillMainBuiltInDisplayCutout">false</bool>
-
- <!-- If true, and there is a cutout on the main built in display, the cutout will be masked
- by shrinking the display such that it does not overlap the cutout area. -->
- <bool name="config_maskMainBuiltInDisplayCutout">true</bool>
-
- <!-- Height of the status bar -->
- <dimen name="status_bar_height_portrait">28dp</dimen>
- <dimen name="status_bar_height_landscape">28dp</dimen>
- <dimen name="rounded_corner_radius_top">70px</dimen>
-
- <!-- Height of area above QQS where battery/time go (equal to status bar height if > 48dp) -->
- <dimen name="quick_qs_offset_height">48dp</dimen>
- <!-- Total height of QQS (quick_qs_offset_height + 128) -->
- <dimen name="quick_qs_total_height">176dp</dimen>
-
-</resources>
diff --git a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/strings.xml b/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/strings.xml
deleted file mode 100644
index 17eb0d5..0000000
--- a/crosshatch/overlay/packages/apps/overlays/NoCutoutOverlay/res/values/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2018 The Android Open Source Project
- ~
- ~ 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.
- -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
- <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that masks the display cutout, i.e. it shrinks the display such that the display cutout is no longer visible.-->
- <string name="display_cutout_emulation_overlay">Hide</string>
-
-</resources>
-
diff --git a/default-permissions.xml b/default-permissions.xml
index 12e043a..32cbceb 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -42,7 +42,8 @@
-->
<exception
- package="com.google.android.apps.pixelmigrate">
+ package="com.google.android.apps.restore"
+ sha256-cert-digest="56:BE:13:2B:78:06:56:FE:24:44:CD:34:32:6E:B5:D7:AA:C9:1D:20:96:AB:F0:FE:67:3A:99:27:06:22:EC:87">
<!-- External storage -->
<permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
<permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
@@ -52,41 +53,8 @@
<!-- Call logs -->
<permission name="android.permission.READ_CALL_LOG" fixed="false"/>
<permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
- <!-- SMS -->
- <permission name="android.permission.RECEIVE_SMS" fixed="false"/>
- <permission name="android.permission.READ_PHONE_NUMBERS" fixed="false"/>
- </exception>
-
- <exception
- package="com.google.android.projection.gearhead"
- sha256-cert-digest="FD:B0:0C:43:DB:DE:8B:51:CB:31:2A:A8:1D:3B:5F:A1:77:13:AD:B9:4B:28:F5:98:D7:7F:8E:B8:9D:AC:EE:DF">
- <!-- Gearhead legacy -->
- <permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
- <permission name="android.permission.CALL_PHONE" fixed="false"/>
- <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
- <permission name="android.permission.READ_CONTACTS" fixed="false"/>
+ <!-- Used to set up a Wi-Fi P2P network -->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
- <permission name="android.permission.RECEIVE_SMS" fixed="false"/>
- <permission name="android.permission.SEND_SMS" fixed="false"/>
- <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
- <permission name="android.permission.READ_CALENDAR" fixed="false"/>
- <!-- For Top Gear -->
- <permission name="android.permission.PROCESS_OUTGOING_CALLS" fixed="false"/>
- <permission name="android.permission.READ_SMS" fixed="false"/>
- <permission name="android.permission.RECEIVE_MMS" fixed="false"/>
- <permission name="android.permission.WRITE_CALL_LOG" fixed="false"/>
- <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
- </exception>
-
- <exception
- package="com.google.android.apps.restore"
- sha256-cert-digest="56:BE:13:2B:78:06:56:FE:24:44:CD:34:32:6E:B5:D7:AA:C9:1D:20:96:AB:F0:FE:67:3A:99:27:06:22:EC:87">
- <!-- External storage -->
- <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
- <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
- <!-- Contacts -->
- <permission name="android.permission.READ_CONTACTS" fixed="false"/>
- <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
</exception>
<exception
@@ -118,6 +86,11 @@
<permission name="android.permission.RECEIVE_WAP_PUSH" fixed="false"/>
</exception>
+ <exception package="com.google.android.apps.camera.services">
+ <!-- Camera -->
+ <permission name="android.permission.CAMERA" fixed="false"/>
+ </exception>
+
<exception package="com.google.android.apps.cbrsnetworkmonitor">
<!-- Location access to create CBRS geofences-->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>
diff --git a/device-common.mk b/device-common.mk
index 610689c..946b748 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -108,10 +108,6 @@
PRODUCT_PACKAGES += \
android.hardware.dumpstate@1.0-service.crosshatch
-# Dmabuf dump tool for bug reports
-PRODUCT_PACKAGES += \
- dmabuf_dump
-
# whitelisted app
PRODUCT_COPY_FILES += \
device/google/crosshatch/qti_whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/qti_whitelist.xml
diff --git a/device-crosshatch.mk b/device-crosshatch.mk
index 44afb3b..6b99df1 100644
--- a/device-crosshatch.mk
+++ b/device-crosshatch.mk
@@ -44,7 +44,8 @@
device/google/crosshatch/nfc/libnfc-nxp.crosshatch.ese.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp-G013D.conf
PRODUCT_PACKAGES += \
- NoCutoutOverlay
+ NoCutoutOverlay \
+ AvoidAppsInCutoutOverlay
# Enable iorapd prefetching by default for crosshatch targets
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device.mk b/device.mk
index eaa84a4..15b65e7 100644
--- a/device.mk
+++ b/device.mk
@@ -23,7 +23,10 @@
hardware/qcom/sdm845 \
vendor/google/camera \
vendor/qcom/sdm845 \
- vendor/google/interfaces
+ vendor/google/interfaces \
+ vendor/google_devices/common/proprietary/confirmatioui_hal \
+ vendor/google_nos/host/android \
+ vendor/google_nos/test/system-test-harness
PRODUCT_PROPERTY_OVERRIDES += \
keyguard.no_require_sim=true
@@ -41,11 +44,11 @@
device/google/crosshatch/default-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/default-permissions.xml \
device/google/crosshatch/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
+ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \
- ro.control_privapp_permissions=enforce
+ ro.control_privapp_permissions?=enforce
# Enable on-access verification of priv apps. This requires fs-verity support in kernel.
PRODUCT_PROPERTY_OVERRIDES += \
@@ -126,8 +129,6 @@
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/init.hardware.mpssrfs.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).mpssrfs.rc
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/init.hardware.chamber.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).chamber.rc
- PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(PRODUCT_PLATFORM).wlc.rc
else
PRODUCT_COPY_FILES += \
@@ -153,10 +154,6 @@
update_engine \
update_verifier
-# Resume on Reboot support
-PRODUCT_PACKAGES += \
- android.hardware.rebootescrow-service.citadel
-
# Use Sdcardfs
PRODUCT_PRODUCT_PROPERTIES += \
ro.sys.sdcardfs=1
@@ -185,7 +182,9 @@
POSTINSTALL_OPTIONAL_vendor=true
PRODUCT_PACKAGES += \
- update_engine_sideload \
+ update_engine_sideload
+
+PRODUCT_PACKAGES_DEBUG += \
sg_write_buffer \
f2fs_io \
check_f2fs
@@ -241,8 +240,8 @@
frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
- frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
- frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \
+ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
+ frameworks/native/data/etc/android.software.opengles.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \
frameworks/native/data/etc/android.hardware.telephony.carrierlock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.carrierlock.xml \
frameworks/native/data/etc/android.hardware.se.omapi.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.se.omapi.uicc.xml \
frameworks/native/data/etc/android.hardware.strongbox_keystore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.strongbox_keystore.xml \
@@ -410,7 +409,7 @@
PRODUCT_PACKAGES += \
android.hardware.drm@1.0-impl \
android.hardware.drm@1.0-service \
- android.hardware.drm@1.3-service.clearkey \
+ android.hardware.drm@1.4-service.clearkey \
android.hardware.drm@1.3-service.widevine
# NFC and Secure Element packages
@@ -441,7 +440,7 @@
device/google/crosshatch/nfc/libese-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libese-nxp.conf
PRODUCT_PACKAGES += \
- android.hardware.usb@1.2-service.crosshatch
+ android.hardware.usb@1.3-service.crosshatch
PRODUCT_PACKAGES += \
libmm-omxcore \
@@ -464,6 +463,12 @@
PRODUCT_PROPERTY_OVERRIDES += \
debug.stagefright.c2inputsurface=-1 \
+# Transcoding related property.
+PRODUCT_PROPERTY_OVERRIDES += \
+ debug.media.transcoding.codec_max_operating_rate_720P=480 \
+ debug.media.transcoding.codec_max_operating_rate_1080P=240 \
+ debug.media.transcoding.codec_max_operating_rate_4k=120 \
+
PRODUCT_PACKAGES += \
libqcodec2 \
vendor.qti.media.c2@1.0-service \
@@ -483,7 +488,7 @@
# Google Camera HAL test libraries in debug builds
PRODUCT_PACKAGES_DEBUG += \
libgoogle_camera_hal_proprietary_tests \
- libgoogle_camera_hal_tests.vendor
+ libgoogle_camera_hal_tests
PRODUCT_PACKAGES += \
sensors.$(PRODUCT_HARDWARE) \
@@ -504,7 +509,14 @@
# Context hub HAL
PRODUCT_PACKAGES += \
- android.hardware.contexthub@1.1-service.generic
+ android.hardware.contexthub@1.2-service.generic
+
+# CHRE tools
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES += \
+ chre_power_test_client \
+ chre_test_client
+endif
# Boot control HAL
PRODUCT_PACKAGES += \
@@ -520,18 +532,18 @@
android.hardware.gnss@1.1-impl-qti \
android.hardware.gnss@1.1-service-qti
-# Wireless Charger HAL
-PRODUCT_PACKAGES += \
- vendor.google.wireless_charger@1.2
-
ENABLE_VENDOR_RIL_SERVICE := true
+USE_QCRIL_OEMHOOK := true
+
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config
HOSTAPD := hostapd
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
HOSTAPD += hostapd_cli
+endif
PRODUCT_PACKAGES += $(HOSTAPD)
WPA := wpa_supplicant.conf
@@ -550,6 +562,10 @@
libwpa_client \
WifiOverlay
+# Connectivity
+PRODUCT_PACKAGES += \
+ ConnectivityOverlay
+
LIB_NL := libnl_2
PRODUCT_PACKAGES += $(LIB_NL)
@@ -571,11 +587,11 @@
audio.bluetooth.default
PRODUCT_PACKAGES += \
- android.hardware.audio@6.0-impl:32 \
- android.hardware.audio.effect@6.0-impl:32 \
+ android.hardware.audio@7.0-impl:32 \
+ android.hardware.audio.effect@7.0-impl:32 \
android.hardware.soundtrigger@2.2-impl \
android.hardware.bluetooth.audio@2.0-impl \
- android.hardware.audio@2.0-service
+ android.hardware.audio.service
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
@@ -592,10 +608,10 @@
$(LOCAL_PATH)/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
$(LOCAL_PATH)/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \
$(LOCAL_PATH)/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration_7_0.xml \
+ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration_7_0.xml \
+ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \
+ frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration_7_0.xml \
frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml
@@ -676,21 +692,6 @@
PRODUCT_PACKAGES += \
android.hardware.dumpstate@1.1-service.crosshatch
-# Citadel
-PRODUCT_PACKAGES += \
- citadeld \
- citadel_updater \
- android.hardware.authsecret@1.0-service.citadel \
- android.hardware.oemlock@1.0-service.citadel \
- android.hardware.weaver@1.0-service.citadel \
- android.hardware.keymaster@4.1-service.citadel \
- android.hardware.identity@1.0-service.citadel \
- wait_for_strongbox
-
-# Citadel debug stuff
-PRODUCT_PACKAGES_DEBUG += \
- test_citadel
-
# Storage: for factory reset protection feature
PRODUCT_PROPERTY_OVERRIDES += \
ro.frp.pst=/dev/block/bootdevice/by-name/frp
@@ -700,7 +701,7 @@
# Override heap growth limit due to high display density on device
PRODUCT_PROPERTY_OVERRIDES += \
- dalvik.vm.heapgrowthlimit=256m
+ dalvik.vm.heapgrowthlimit?=256m
PRODUCT_PACKAGES += \
ipacm \
@@ -848,7 +849,7 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=54
+ ro.vendor.build.svn=59
PRODUCT_PRODUCT_PROPERTIES += \
ro.adb.secure=1
@@ -859,7 +860,6 @@
# fastbootd
PRODUCT_PACKAGES += \
- android.hardware.fastboot@1.0-impl.pixel \
fastbootd
PRODUCT_COPY_FILES += \
@@ -901,7 +901,21 @@
include hardware/google/pixel/pixelstats/device.mk
include hardware/google/pixel/mm/device_legacy.mk
include hardware/google/pixel/thermal/device.mk
+
+# Citadel
include hardware/google/pixel/citadel/citadel.mk
# power HAL
-include hardware/google/pixel/power-libperfmgr/aidl/device.mk
+
+# Set support one-handed mode
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.support_one_handed_mode=true
+
+# Set support hide display cutout feature
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.support_hide_display_cutout=true
+
+# Set system properties identifying the chipset
+PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Qualcomm
+PRODUCT_VENDOR_PROPERTIES += ro.soc.model=SDM845
diff --git a/device_framework_matrix.xml b/device_framework_matrix.xml
index a4044d0..d37f82e 100644
--- a/device_framework_matrix.xml
+++ b/device_framework_matrix.xml
@@ -63,7 +63,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.google.radioext</name>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IRadioExt</name>
<instance>default</instance>
@@ -71,7 +71,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.google.wireless_charger</name>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>
@@ -185,7 +185,7 @@
<hal format="hidl" optional="true">
<name>vendor.google.wifi_ext</name>
<transport>hwbinder</transport>
- <version>1.1</version>
+ <version>1.2</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index fdcfb9a..144a768 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -27,6 +27,7 @@
#include <log/log.h>
#include <pthread.h>
#include <string.h>
+#include <sys/stat.h>
#define _SVID_SOURCE
#include <dirent.h>
@@ -67,13 +68,146 @@
#define TCPDUMP_LOG_PREFIX "tcpdump"
#define EXTENDED_LOG_PREFIX "extended_log_"
+#define BUFSIZE 65536
+static void copyFile(std::string srcFile, std::string destFile) {
+ uint8_t buffer[BUFSIZE];
+ ssize_t size;
+
+ int fdSrc = open(srcFile.c_str(), O_RDONLY);
+ if (fdSrc < 0) {
+ ALOGD("Failed to open source file %s\n", srcFile.c_str());
+ return;
+ }
+
+ int fdDest = open(destFile.c_str(), O_WRONLY | O_CREAT, 0666);
+ if (fdDest < 0) {
+ ALOGD("Failed to open destination file %s\n", destFile.c_str());
+ close(fdSrc);
+ return;
+ }
+
+ ALOGD("Copying %s to %s\n", srcFile.c_str(), destFile.c_str());
+ while ((size = TEMP_FAILURE_RETRY(read(fdSrc, buffer, BUFSIZE))) > 0) {
+ TEMP_FAILURE_RETRY(write(fdDest, buffer, size));
+ }
+
+ close(fdDest);
+ close(fdSrc);
+}
+
+struct PosixTarHeader {
+ char name[100]; /* 0 */
+ char mode[8]; /* 100 */
+ char uid[8]; /* 108 */
+ char gid[8]; /* 116 */
+ char size[12]; /* 124 */
+ char mtime[12]; /* 136 */
+ char chksum[8]; /* 148 */
+ char typeflag; /* 156 */
+ char linkname[100]; /* 157 */
+ char magic[6]; /* 257 */
+ char version[2]; /* 259 */
+ char uname[32]; /* 265 */
+ char gname[32]; /* 297 */
+ char devmajor[8]; /* 329 */
+ char devminor[8]; /* 337 */
+ char prefix[155]; /* 345 */
+ char pad[12]; /* 500 */
+};
+
+static unsigned int tarCheckSum(PosixTarHeader *header) {
+ unsigned int sum = 0;
+ char *p = (char *)header;
+ char *q = p + sizeof(PosixTarHeader);
+ for (int i = 0; i < 8; i++) {
+ header->chksum[i] = ' ';
+ }
+ while (p < q) {
+ sum += *p++ & 0xff;
+ }
+ return sum;
+}
+
+static PosixTarHeader *tarHeader(PosixTarHeader *header, char *fileName, ssize_t fileSize) {
+ memset(header, 0, sizeof(PosixTarHeader));
+ strcpy(header->name, fileName);
+ sprintf(header->mode, "%07o", 0600);
+ sprintf(header->size, "%011llo", (long long unsigned int)fileSize);
+ sprintf(header->mtime, "%011o", 0);
+ header->typeflag = '0';
+ strcpy(header->magic, "ustar");
+ strcpy(header->version, " ");
+ sprintf(header->chksum, "%06o", tarCheckSum(header));
+ return header;
+}
+
+static void createTarFile(std::string tarFile, std::string srcDir) {
+ uint8_t buffer[BUFSIZE];
+ struct dirent *dirent;
+ struct stat st;
+ PosixTarHeader header;
+ ssize_t size, tarLen = 0, blockSize = sizeof(PosixTarHeader);
+ char padding = '\0';
+
+ DIR *dirp = opendir(srcDir.c_str());
+ if (dirp == NULL) {
+ ALOGD("Unable to open folder %s\n", srcDir.c_str());
+ return;
+ }
+
+ int fdTar = open(tarFile.c_str(), O_WRONLY | O_CREAT, 0666);
+ if (fdTar < 0) {
+ ALOGD("Unable to open file %s\n", tarFile.c_str());
+ closedir(dirp);
+ return;
+ }
+
+ ALOGD("Creating tar file %s\n", tarFile.c_str());
+ while ((dirent = readdir(dirp)) != NULL) {
+ if (dirent->d_name[0] == '.') {
+ continue;
+ }
+
+ std::string path = srcDir + "/" + dirent->d_name;
+ int fd = open(path.c_str(), O_RDONLY);
+ if (fd < 0) {
+ ALOGD("Unable to open file %s\n", path.c_str());
+ continue;
+ }
+ fstat(fd, &st);
+
+ if (TEMP_FAILURE_RETRY(write(fdTar, tarHeader(
+ &header, dirent->d_name, st.st_size), blockSize)) <= 0) {
+ ALOGD("Error while writing file %s, errno=%d\n", tarFile.c_str(), errno);
+ close(fd);
+ continue;
+ }
+ tarLen += blockSize;
+
+ while ((size = TEMP_FAILURE_RETRY(read(fd, buffer, BUFSIZE))) > 0) {
+ write(fdTar, buffer, size);
+ tarLen += size;
+ }
+
+ while (tarLen % blockSize != 0) {
+ write(fdTar, &padding, 1);
+ tarLen++;
+ }
+ close(fd);
+ }
+ close(fdTar);
+ closedir(dirp);
+}
+
static void dumpLogs(int fd, std::string srcDir, std::string destDir,
int maxFileNum, const char *logPrefix) {
+ (void) fd;
struct dirent **dirent_list = NULL;
int num_entries = scandir(srcDir.c_str(),
&dirent_list,
0,
(int (*)(const struct dirent **, const struct dirent **)) alphasort);
+
if (!dirent_list) {
return;
} else if (num_entries <= 0) {
@@ -96,14 +230,9 @@
copiedFiles++;
- CommandOptions options = CommandOptions::WithTimeout(120).Build();
std::string srcLogFile = srcDir + "/" + dirent_list[i]->d_name;
std::string destLogFile = destDir + "/" + dirent_list[i]->d_name;
-
- std::string copyCmd = "/vendor/bin/cp " + srcLogFile + " " + destLogFile;
-
- ALOGD("Copying %s to %s\n", srcLogFile.c_str(), destLogFile.c_str());
- RunCommandToFd(fd, "CP DIAG LOGS", { "/vendor/bin/sh", "-c", copyCmd.c_str() }, options);
+ copyFile(srcLogFile, destLogFile);
}
while (num_entries--) {
@@ -132,22 +261,10 @@
return NULL;
}
- sleep(1);
- ALOGD("Waited modem for 1 second to flush logs");
-
- const std::string modemLogCombined = modemLogDir + "/" + filePrefix + "all.tar";
- const std::string modemLogAllDir = modemLogDir + "/modem_log";
-
- RunCommandToFd(STDOUT_FILENO, "MKDIR MODEM LOG", {"/vendor/bin/mkdir", "-p", modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
-
- const std::string diagLogDir = "/data/vendor/radio/diag_logs/logs";
- const std::string diagPoweronLogPath = "/data/vendor/radio/diag_logs/logs/diag_poweron_log.qmdl";
-
bool diagLogEnabled = android::base::GetBoolProperty(DIAG_MDLOG_PERSIST_PROPERTY, false);
+ bool diagLogStarted = android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false);
if (diagLogEnabled) {
- bool diagLogStarted = android::base::GetBoolProperty( DIAG_MDLOG_STATUS_PROPERTY, false);
-
if (diagLogStarted) {
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
ALOGD("Stopping diag_mdlog...\n");
@@ -159,7 +276,20 @@
} else {
ALOGD("diag_mdlog is not running");
}
+ }
+ sleep(1);
+ ALOGD("Waited modem for 1 second to flush logs");
+
+ const std::string modemLogCombined = modemLogDir + "/" + filePrefix + "all.tar";
+ const std::string modemLogAllDir = modemLogDir + "/modem_log";
+
+ RunCommandToFd(STDOUT_FILENO, "MKDIR MODEM LOG", {"/vendor/bin/mkdir", "-p", modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
+
+ const std::string diagLogDir = "/data/vendor/radio/diag_logs/logs";
+ const std::string diagPoweronLogPath = "/data/vendor/radio/diag_logs/logs/diag_poweron_log.qmdl";
+
+ if (diagLogEnabled) {
dumpLogs(STDOUT_FILENO, diagLogDir, modemLogAllDir, android::base::GetIntProperty(DIAG_MDLOG_NUMBER_BUGREPORT, 100), DIAG_LOG_PREFIX);
if (diagLogStarted) {
@@ -167,7 +297,7 @@
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
}
}
- RunCommandToFd(STDOUT_FILENO, "CP MODEM POWERON LOG", {"/vendor/bin/cp", diagPoweronLogPath.c_str(), modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
+ copyFile(diagPoweronLogPath, modemLogAllDir + "/" + basename(diagPoweronLogPath.c_str()));
if (!PropertiesHelper::IsUserBuild()) {
android::base::SetProperty(MODEM_EFS_DUMP_PROPERTY, "true");
@@ -203,15 +333,14 @@
}
for (const auto& logFile : rilAndNetmgrLogs) {
- RunCommandToFd(STDOUT_FILENO, "CP MODEM LOG", {"/vendor/bin/cp", logFile.c_str(), modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
+ copyFile(logFile, modemLogAllDir + "/" + basename(logFile.c_str()));
}
dumpLogs(STDOUT_FILENO, extendedLogDir, modemLogAllDir, 100, EXTENDED_LOG_PREFIX);
android::base::SetProperty(MODEM_EFS_DUMP_PROPERTY, "false");
}
- RunCommandToFd(STDOUT_FILENO, "TAR LOG", {"/vendor/bin/tar", "cvf", modemLogCombined.c_str(), "-C", modemLogAllDir.c_str(), "."}, CommandOptions::WithTimeout(20).Build());
- RunCommandToFd(STDOUT_FILENO, "CHG PERM", {"/vendor/bin/chmod", "a+w", modemLogCombined.c_str()}, CommandOptions::WithTimeout(2).Build());
+ createTarFile(modemLogCombined, modemLogAllDir);
std::vector<uint8_t> buffer(65536);
android::base::unique_fd fdLog(TEMP_FAILURE_RETRY(open(modemLogCombined.c_str(), O_RDONLY | O_CLOEXEC | O_NONBLOCK)));
@@ -461,6 +590,7 @@
DumpFileToFd(fd, "TCPM logs", "/d/tcpm/usbpd0");
DumpFileToFd(fd, "PD Engine", "/d/logbuffer/usbpd");
DumpFileToFd(fd, "smb-lib", "/d/logbuffer/smblib");
+ DumpFileToFd(fd, "WLC logs", "/d/logbuffer/wireless");
DumpFileToFd(fd, "ipc-local-ports", "/d/msm_ipc_router/dump_local_ports");
DumpFileToFd(fd, "ipc-servers", "/d/msm_ipc_router/dump_servers");
RunCommandToFd(fd, "ipc-logs",
@@ -515,6 +645,8 @@
// Dump fastrpc dma buffer size
DumpFileToFd(fd, "Fastrpc dma buffer", "/sys/kernel/fastrpc/total_dma_kb");
+ // Dump page owner
+ DumpFileToFd(fd, "Page Owner", "/sys/kernel/debug/page_owner");
if (modemThreadHandle) {
pthread_join(modemThreadHandle, NULL);
}
diff --git a/fstab.hardware b/fstab.hardware
index a3c9aa9..c2b15c7 100644
--- a/fstab.hardware
+++ b/fstab.hardware
@@ -5,7 +5,7 @@
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
product /product ext4 ro,barrier=1 wait,slotselect,avb,logical,first_stage_mount
-/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,sync wait,formattable,first_stage_mount
+/dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard,data=journal,commit=1 wait,formattable,first_stage_mount
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,fileencryption=ice,keydirectory=/metadata/vold/metadata_encryption,quota,formattable,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc,reservedsize=128M,checkpoint=fs
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
diff --git a/health/HealthService.cpp b/health/HealthService.cpp
index d97c1a8..bf4555d 100644
--- a/health/HealthService.cpp
+++ b/health/HealthService.cpp
@@ -77,6 +77,9 @@
const std::string kDiskStatsFile{"/sys/block/sda/stat"};
const std::string kUFSName{"UFS0"};
+static bool needs_wlc_updates = false;
+constexpr char kWlcCapacity[]{WLC_DIR "/capacity"};
+
std::ifstream assert_open(const std::string &path) {
std::ifstream stream(path);
if (!stream.is_open()) {
@@ -108,6 +111,12 @@
} // anonymous namespace
+static bool FileExists(const std::string &filename) {
+ struct stat buffer;
+
+ return stat(filename.c_str(), &buffer) == 0;
+}
+
void healthd_board_init(struct healthd_config *config) {
using ::device::google::crosshatch::health::kChargerStatus;
@@ -115,6 +124,8 @@
ccBackupRestoreMAX.Restore();
config->batteryStatusPath = kChargerStatus.c_str();
+
+ needs_wlc_updates = FileExists(kWlcCapacity);
}
int healthd_board_battery_update(struct android::BatteryProperties *props) {
@@ -126,9 +137,11 @@
ccBackupRestoreBMS.Backup(props->batteryLevel);
ccBackupRestoreMAX.Backup(props->batteryLevel);
battDefender.update(props);
- if (!android::base::WriteStringToFile(std::to_string(props->batteryLevel),
- "/sys/class/power_supply/wireless/capacity"))
+
+ if (needs_wlc_updates &&
+ !android::base::WriteStringToFile(std::to_string(props->batteryLevel), kWlcCapacity))
LOG(INFO) << "Unable to write battery level to wireless capacity";
+
return 0;
}
diff --git a/init.hardware.chamber.rc.userdebug b/init.hardware.chamber.rc.userdebug
deleted file mode 100644
index e16579b..0000000
--- a/init.hardware.chamber.rc.userdebug
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2018 The Android Open-Source Project
-#
-# 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.
-#
-
-on property:persist.vendor.disable.thermal.control=1
- stop vendor.thermal-engine
- write /sys/module/overheat_mitigation/parameters/enable 0
-
-on property:persist.vendor.disable.thermal.control=1 && property:vendor.thermal.hw_mode=-evt
- write /sys/devices/virtual/thermal/tz-by-name/quiet-therm-adc/mode disabled
- write /sys/devices/virtual/thermal/tz-by-name/quiet-therm-monitor/mode disabled
-
-on property:persist.vendor.disable.thermal.control=1 && property:vendor.thermal.hw_mode=-prod
- write /sys/devices/virtual/thermal/tz-by-name/fps-therm-adc/mode disabled
- write /sys/devices/virtual/thermal/tz-by-name/fps-therm-monitor/mode disabled
-
-on property:persist.vendor.disable.usb.overheat.mitigation=1
- write /sys/module/overheat_mitigation/parameters/enable 0
diff --git a/init.hardware.diag.rc.userdebug b/init.hardware.diag.rc.userdebug
index b3e4a80..941fe80 100644
--- a/init.hardware.diag.rc.userdebug
+++ b/init.hardware.diag.rc.userdebug
@@ -109,3 +109,9 @@
on property:persist.vendor.usb.usbradio.config=*
start usbd
+
+on property:power.battery_input.suspended=true
+ write /sys/class/power_supply/battery/input_suspend 1
+
+on property:power.battery_input.suspended=false
+ write /sys/class/power_supply/battery/input_suspend 0
diff --git a/init.hardware.rc b/init.hardware.rc
index 00960b3..d935553 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -87,19 +87,11 @@
write /sys/block/sda/queue/iostats 0
write /sys/block/sda/queue/scheduler cfq
write /sys/block/sda/queue/iosched/slice_idle 0
- write /sys/block/sda/queue/read_ahead_kb 2048
write /sys/block/sda/queue/nr_requests 256
write /sys/block/sdf/queue/iostats 0
write /sys/block/sdf/queue/scheduler cfq
write /sys/block/sdf/queue/iosched/slice_idle 0
- write /sys/block/sdf/queue/read_ahead_kb 2048
write /sys/block/sdf/queue/nr_requests 256
- write /sys/block/dm-0/queue/read_ahead_kb 2048
- write /sys/block/dm-1/queue/read_ahead_kb 2048
- write /sys/block/dm-2/queue/read_ahead_kb 2048
- write /sys/block/dm-3/queue/read_ahead_kb 2048
- write /sys/block/dm-4/queue/read_ahead_kb 2048
- write /sys/block/dm-5/queue/read_ahead_kb 2048
# Disable UFS powersaving
write /sys/devices/platform/soc/${ro.boot.bootdevice}/clkgate_enable 0
@@ -137,12 +129,9 @@
write /dev/stune/top-app/schedtune.boost 10
write /dev/stune/top-app/schedtune.prefer_idle 1
- mkdir /dev/cpuset/camera-daemon
- write /dev/cpuset/camera-daemon/cpus 0-7
- write /dev/cpuset/camera-daemon/mems 0
- chown system system /dev/cpuset/camera-daemon
- chown system system /dev/cpuset/camera-daemon/tasks
- chmod 0664 /dev/cpuset/camera-daemon/tasks
+ # set default schedTune value for camera-daemon
+ write /dev/stune/camera-daemon/schedtune.prefer_idle 1
+ write /dev/stune/camera-daemon/schedtune.boost 0
# b/37682684 Enable suspend clock reporting
write /sys/kernel/debug/clk/debug_suspend 1
@@ -178,8 +167,13 @@
chown system system /sys/devices/platform/soc/soc:google,charger/bd_trigger_time
chown system system /sys/devices/platform/soc/soc:google,charger/bd_trigger_voltage
chown system system /sys/devices/platform/soc/soc:google,charger/bd_temp_enable
+ chown system system /sys/devices/platform/soc/soc:google,charger/bd_clear
+ chown system system /sys/class/power_supply/wireless/device/mitigate_threshold
on late-init
+ write /sys/devices/virtual/thermal/tz-by-name/quiet-therm-adc/mode enabled
+ chown system system /sys/devices/virtual/thermal/tz-by-name/quiet-therm-monitor/trip_point_0_temp
+ chown system system /sys/devices/virtual/thermal/tz-by-name/quiet-therm-monitor/trip_point_0_hyst
write /sys/devices/virtual/thermal/tz-by-name/fps-therm-adc/mode enabled
chown system system /sys/devices/virtual/thermal/tz-by-name/fps-therm-monitor/trip_point_0_temp
chown system system /sys/devices/virtual/thermal/tz-by-name/fps-therm-monitor/trip_point_0_hyst
@@ -234,10 +228,6 @@
# Mount RW partitions which need run fsck
mount_all /vendor/etc/fstab.${ro.boot.hardware.platform} --late
- # Boot time fs tune
- write /sys/block/dm-3/queue/read_ahead_kb 2048
- write /sys/block/dm-4/queue/read_ahead_kb 2048
- write /sys/block/dm-6/queue/read_ahead_kb 2048
# Required for time_daemon
mkdir /persist/time 0770 system system
@@ -245,6 +235,9 @@
# Start time daemon early so that the system time can be set early
start time_daemon
+ # Write build info to kdebuginfo.
+ write /sys/module/kdebuginfo/parameters/build_info "${ro.product.name}-${ro.build.type} ${ro.build.version.incremental}"
+
on post-fs
# Disable sched autogroup
write /proc/sys/kernel/sched_autogroup_enabled 0
@@ -349,6 +342,10 @@
mkdir /data/vendor/sensors/log 0770
chown system system /data/vendor/sensors/log
+ # Restore SeLinux Context for preventing temp.json with
+ # incorrect security context
+ restorecon /mnt/vendor/persist/sensors/registry/temp.json
+
chmod 770 /persist/audio
chmod 660 /persist/audio/audio.cal
chown media audio /persist/audio
@@ -572,21 +569,12 @@
write /dev/cpuset/restricted/cpus 0-3
# Runtime fs tuning: as we have init boottime setting and kernel patch setting
- # default readahead to 2048KB. We should adjust the setting upon boot_complete
+ # We should adjust the setting upon boot_complete
# for runtime performance
- write /sys/block/sda/queue/read_ahead_kb 128
write /sys/block/sda/queue/nr_requests 128
write /sys/block/sda/queue/iostats 1
- write /sys/block/sdf/queue/read_ahead_kb 128
write /sys/block/sdf/queue/nr_requests 128
write /sys/block/sdf/queue/iostats 1
- write /sys/block/dm-0/queue/read_ahead_kb 128
- write /sys/block/dm-1/queue/read_ahead_kb 128
- write /sys/block/dm-2/queue/read_ahead_kb 128
- write /sys/block/dm-3/queue/read_ahead_kb 128
- write /sys/block/dm-4/queue/read_ahead_kb 128
- write /sys/block/dm-5/queue/read_ahead_kb 128
- write /sys/block/dm-6/queue/read_ahead_kb 128
# Block layer tuning: discard chunk size up to 128MB
# Otherwise, contiguous discards can be merged
@@ -635,7 +623,7 @@
mkdir /data/vendor/wifidump 771 root system
mkdir /data/vendor/ramdump 771 root system
mkdir /data/vendor/ssrdump 771 root system
- mkdir /data/vendor/ssrlog 771 root system
+ mkdir /data/vendor/ssrlog 775 root system
start ss_ramdump
on property:persist.vendor.sys.ssr.enable_ramdumps=0
@@ -850,23 +838,10 @@
disabled
oneshot
-# Clear the dark theme magic in /misc partition.
-service vendor.theme_clear /vendor/bin/misc_writer --clear-dark-theme
- disabled
- oneshot
-
-# Set dark boot flag on dark mode (UiModeManager.MODE_NIGHT_YES == 2).
-on property:persist.sys.theme=2
+# Set dark boot flag when the device is provisioned.
+on property:persist.sys.device_provisioned=1
start vendor.theme_set
-# Clear the dark boot flag on light mode (UiModeManager.MODE_NIGHT_NO == 1) or auto mode
-# (UiModeManager.MODE_NIGHT_AUTO == 0).
-on property:persist.sys.theme=1
- start vendor.theme_clear
-
-on property:persist.sys.theme=0
- start vendor.theme_clear
-
on init && property:ro.boot.slot_successful=no
write /sys/module/msm_poweroff/parameters/warm_reset 1
diff --git a/manifest.xml b/manifest.xml
index 2c4ba8d..5954f56 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
- <version>6.0</version>
+ <version>7.0</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
@@ -11,7 +11,7 @@
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
- <version>6.0</version>
+ <version>7.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
@@ -260,22 +260,13 @@
<hal format="hidl">
<name>vendor.google.radioext</name>
<transport>hwbinder</transport>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IRadioExt</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
- <name>vendor.google.wireless_charger</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IWirelessCharger</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.radio</name>
<transport>hwbinder</transport>
<fqname>@1.2::ISap/slot1</fqname>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 3d62ae9..a42f6d7 100755
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -206,13 +206,6 @@
<item>"9,1"</item>
</string-array>
- <!-- If the hardware supports specially marking packets that caused a wakeup of the
- main CPU, set this value to the mark used. -->
- <integer name="config_networkWakeupPacketMark">0x80000000</integer>
-
- <!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->
- <integer name="config_networkWakeupPacketMask">0x80000000</integer>
-
<!-- Vibrator pattern for feedback about a long screen/key press -->
<!-- TODO(b/78128429): increase duration to account for the long latency -->
<integer-array name="config_longPressVibePattern">
@@ -324,7 +317,7 @@
<item>"/apex/com.android.art/javalib/core-libart.jar"</item>
<item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
<item>"/system_ext/priv-app/SystemUIGoogle/SystemUIGoogle.apk"</item>
- <item>"/system/lib64/libsurfaceflinger.so"</item>
+ <item>"/system/bin/surfaceflinger"</item>
</string-array>
<!-- Should the pinner service pin the Camera application? -->
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values-mcc440-mnc20/config.xml b/overlay/frameworks/base/packages/SettingsLib/res/values-mcc440-mnc20/config.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values-mcc440-mnc20/config.xml
rename to overlay/frameworks/base/packages/SettingsLib/res/values-mcc440-mnc20/config.xml
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 7e9d21d..1cbe1e5 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -43,4 +43,7 @@
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
+
+ <!-- Whether global actions should show an informational message about changes in S -->
+ <bool name="global_actions_show_change_info">true</bool>
</resources>
diff --git a/overlay/packages/apps/Nfc/res/values/config.xml b/overlay/packages/apps/Nfc/res/values/config.xml
index 9082100..602dabc 100644
--- a/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/overlay/packages/apps/Nfc/res/values/config.xml
@@ -19,7 +19,9 @@
<integer name="unknown_tag_polling_delay">2000</integer>
<string name="antenna_blocked_alert_link" translatable="false">https://support.google.com/pixelphone?p=nfc_tag_notification</string>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
+ <item>G013A</item>
<item>G013B</item>
+ <item>G013C</item>
<item>G013D</item>
</string-array>
</resources>
diff --git a/pixelstats/Android.bp b/pixelstats/Android.bp
index 21360ff..4bb5d7f 100644
--- a/pixelstats/Android.bp
+++ b/pixelstats/Android.bp
@@ -25,9 +25,6 @@
],
shared_libs: [
"libbase",
- "libbinder",
- "libcutils",
- "libhidlbase",
"liblog",
"libutils",
"libpixelstats",
diff --git a/pixelstats/pixelstats-vendor.crosshatch.rc b/pixelstats/pixelstats-vendor.crosshatch.rc
index 22254bb..fdf8f79 100644
--- a/pixelstats/pixelstats-vendor.crosshatch.rc
+++ b/pixelstats/pixelstats-vendor.crosshatch.rc
@@ -1,4 +1,4 @@
service vendor.pixelstats_vendor /vendor/bin/pixelstats-vendor
class hal
user system
- group system context_hub
+ group system context_hub readproc
diff --git a/rro_overlays/ConnectivityOverlay/Android.bp b/rro_overlays/ConnectivityOverlay/Android.bp
new file mode 100644
index 0000000..e76c15a
--- /dev/null
+++ b/rro_overlays/ConnectivityOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "ConnectivityOverlay",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/rro_overlays/ConnectivityOverlay/AndroidManifest.xml b/rro_overlays/ConnectivityOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..f349b7f
--- /dev/null
+++ b/rro_overlays/ConnectivityOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+ 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.
+-->
+<!-- Pixel specific connectivity overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.connectivity.resources.overlay"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:hasCode="false" />
+ <overlay
+ android:targetPackage="com.android.connectivity.resources"
+ android:targetName="ServiceConnectivityResourcesConfig"
+ android:isStatic="true"
+ android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/ConnectivityOverlay/res/values/config.xml b/rro_overlays/ConnectivityOverlay/res/values/config.xml
new file mode 100644
index 0000000..d9a29b0
--- /dev/null
+++ b/rro_overlays/ConnectivityOverlay/res/values/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * 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.
+ */
+-->
+<resources>
+ <!-- If the hardware supports specially marking packets that caused a wakeup of the
+ main CPU, set this value to the mark used. -->
+ <integer translatable="false" name="config_networkWakeupPacketMark">0x80000000</integer>
+
+ <!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->
+ <integer translatable="false" name="config_networkWakeupPacketMask">0x80000000</integer>
+</resources>
diff --git a/rro_overlays/WifiOverlay/OWNERS b/rro_overlays/WifiOverlay/OWNERS
index efe20f1..cd92d6f 100644
--- a/rro_overlays/WifiOverlay/OWNERS
+++ b/rro_overlays/WifiOverlay/OWNERS
@@ -1,5 +1,5 @@
# People who can approve changes for submission
etancohen@google.com
-kumaranand@google.com
+arabawy@google.com
kumachang@google.com
satk@google.com
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 04085ad..a2ec657 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -88,4 +88,7 @@
<!-- Disable WPA2 to WPA3 auto-upgrade -->
<bool translatable="false" name="config_wifiSaeUpgradeEnabled">false</bool>
+
+ <!-- Whether to use the explicit vendor HAL API: IWifiStaIface.setRoamingState for disabling fw roaming. -->
+ <bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool>
</resources>
diff --git a/sdm845/kernel-headers/sound/compress_params.h b/sdm845/kernel-headers/sound/compress_params.h
index 6f9e6d1..1172f26 100644
--- a/sdm845/kernel-headers/sound/compress_params.h
+++ b/sdm845/kernel-headers/sound/compress_params.h
@@ -240,6 +240,9 @@
__u32 uap;
__u32 nap;
};
+struct snd_dec_amrwb_plus {
+ __u32 bit_stream_fmt;
+};
union snd_codec_options {
struct snd_enc_wma wma;
struct snd_enc_vorbis vorbis;
@@ -252,6 +255,7 @@
struct snd_dec_alac alac;
struct snd_dec_ape ape;
struct snd_dec_aptx aptx_dec;
+ struct snd_dec_amrwb_plus amrwbplus;
};
struct snd_codec_desc {
__u32 max_ch;
@@ -290,4 +294,3 @@
__u32 reserved[4];
};
#endif
-
diff --git a/sdm845/original-kernel-headers/sound/compress_params.h b/sdm845/original-kernel-headers/sound/compress_params.h
index 8c84053..278bf12 100644
--- a/sdm845/original-kernel-headers/sound/compress_params.h
+++ b/sdm845/original-kernel-headers/sound/compress_params.h
@@ -406,6 +406,10 @@
__u32 nap;
};
+struct snd_dec_amrwb_plus {
+ __u32 bit_stream_fmt;
+};
+
union snd_codec_options {
struct snd_enc_wma wma;
struct snd_enc_vorbis vorbis;
@@ -418,6 +422,7 @@
struct snd_dec_alac alac;
struct snd_dec_ape ape;
struct snd_dec_aptx aptx_dec;
+ struct snd_dec_amrwb_plus amrwbplus;
};
/** struct snd_codec_desc - description of codec capabilities
diff --git a/ueventd.hardware.rc b/ueventd.hardware.rc
index 0f72ac4..eb382be 100644
--- a/ueventd.hardware.rc
+++ b/ueventd.hardware.rc
@@ -122,3 +122,7 @@
# Resume-on-Reboot
/dev/access-kregistry 0660 system system
+
+# Input
+/sys/devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.1.auto/usb1/1-1/*/*/leds/* brightness 0660 system system
+/sys/devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.1.auto/usb1/1-1/*/*/leds/* multi_intensity 0660 system system
diff --git a/usb/Android.bp b/usb/Android.bp
index ffc7b5c..36eca5c 100644
--- a/usb/Android.bp
+++ b/usb/Android.bp
@@ -18,11 +18,11 @@
}
cc_binary {
- name: "android.hardware.usb@1.2-service.crosshatch",
+ name: "android.hardware.usb@1.3-service.crosshatch",
relative_install_path: "hw",
- init_rc: ["android.hardware.usb@1.2-service.crosshatch.rc"],
+ init_rc: ["android.hardware.usb@1.3-service.crosshatch.rc"],
vintf_fragments: [
- "android.hardware.usb@1.2-service.crosshatch.xml",
+ "android.hardware.usb@1.3-service.crosshatch.xml",
"android.hardware.usb.gadget@1.1-service.crosshatch.xml",
],
srcs: ["service.cpp", "Usb.cpp", "UsbGadget.cpp"],
@@ -30,6 +30,7 @@
"android.hardware.usb@1.0",
"android.hardware.usb@1.1",
"android.hardware.usb@1.2",
+ "android.hardware.usb@1.3",
"android.hardware.usb.gadget@1.0",
"android.hardware.usb.gadget@1.1",
"libbase",
diff --git a/usb/Usb.cpp b/usb/Usb.cpp
index 3aa5aa6..72a0500 100644
--- a/usb/Usb.cpp
+++ b/usb/Usb.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.usb@1.2-service.crosshatch"
+#define LOG_TAG "android.hardware.usb@1.3-service.crosshatch"
#include <android-base/file.h>
#include <android-base/logging.h>
@@ -41,9 +41,49 @@
namespace android {
namespace hardware {
namespace usb {
-namespace V1_2 {
+namespace V1_3 {
namespace implementation {
+Return<bool> Usb::enableUsbDataSignal(bool enable) {
+ bool result = true;
+
+ ALOGI("Userspace turn %s USB data signaling", enable ? "on" : "off");
+
+ if (enable) {
+ if (!WriteStringToFile("1", USB_DATA_PATH)) {
+ ALOGE("Not able to turn on usb connection notification");
+ result = false;
+ }
+
+ if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
+ ALOGE("Gadget cannot be pulled up");
+ result = false;
+ }
+ } else {
+ if (!WriteStringToFile("1", ID_PATH)) {
+ ALOGE("Not able to turn off host mode");
+ result = false;
+ }
+
+ if (!WriteStringToFile("0", VBUS_PATH)) {
+ ALOGE("Not able to set Vbus state");
+ result = false;
+ }
+
+ if (!WriteStringToFile("0", USB_DATA_PATH)) {
+ ALOGE("Not able to turn on usb connection notification");
+ result = false;
+ }
+
+ if (!WriteStringToFile("none", PULLUP_PATH)) {
+ ALOGE("Gadget cannot be pulled down");
+ result = false;
+ }
+ }
+
+ return result;
+}
+
// Set by the signal handler to destroy the thread
volatile bool destroyThread;
@@ -84,13 +124,10 @@
(*currentPortStatus_1_2)[0].contaminantProtectionStatus =
V1_2::ContaminantProtectionStatus::NONE;
(*currentPortStatus_1_2)[0].contaminantDetectionStatus =
- V1_2::ContaminantDetectionStatus::DISABLED;
+ V1_2::ContaminantDetectionStatus::NOT_DETECTED;
(*currentPortStatus_1_2)[0].supportsEnableContaminantPresenceDetection = false;
(*currentPortStatus_1_2)[0].supportsEnableContaminantPresenceProtection = false;
- (*currentPortStatus_1_2)[0].contaminantDetectionStatus =
- V1_2::ContaminantDetectionStatus::NOT_DETECTED;
-
ALOGI("ContaminantDetectionStatus:%d ContaminantProtectionStatus:%d",
(*currentPortStatus_1_2)[0].contaminantDetectionStatus,
(*currentPortStatus_1_2)[0].contaminantProtectionStatus);
@@ -503,7 +540,8 @@
return Status::ERROR;
}
-void queryVersionHelper(Usb *usb, hidl_vec<PortStatus> *currentPortStatus_1_2) {
+void queryVersionHelper(android::hardware::usb::V1_3::implementation::Usb *usb,
+ hidl_vec<PortStatus> *currentPortStatus_1_2) {
hidl_vec<V1_1::PortStatus_1_1> currentPortStatus_1_1;
hidl_vec<V1_0::PortStatus> currentPortStatus;
Status status;
@@ -571,7 +609,7 @@
/* uevent_event() data that is persistent across uevents. */
struct data {
int uevent_fd;
- android::hardware::usb::V1_2::implementation::Usb *usb;
+ android::hardware::usb::V1_3::implementation::Usb *usb;
};
// Report connection & disconnection of devices into the USB-C connector.
@@ -643,7 +681,7 @@
}
payload.uevent_fd = uevent_fd;
- payload.usb = (android::hardware::usb::V1_2::implementation::Usb *)param;
+ payload.usb = (android::hardware::usb::V1_3::implementation::Usb *)param;
fcntl(uevent_fd, F_SETFL, O_NONBLOCK);
@@ -756,7 +794,7 @@
}
} // namespace implementation
-} // namespace V1_2
+} // namespace V1_3
} // namespace usb
} // namespace hardware
} // namespace android
diff --git a/usb/Usb.h b/usb/Usb.h
index 03990b1..6926dc3 100644
--- a/usb/Usb.h
+++ b/usb/Usb.h
@@ -1,8 +1,9 @@
#pragma once
-#include <android/hardware/usb/1.2/IUsb.h>
+#include <android-base/file.h>
#include <android/hardware/usb/1.2/IUsbCallback.h>
#include <android/hardware/usb/1.2/types.h>
+#include <android/hardware/usb/1.3/IUsb.h>
#include <hidl/Status.h>
#include <utils/Log.h>
@@ -16,10 +17,11 @@
namespace android {
namespace hardware {
namespace usb {
-namespace V1_2 {
+namespace V1_3 {
namespace implementation {
using ::android::sp;
+using ::android::base::WriteStringToFile;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory;
using ::android::hardware::hidl_string;
@@ -33,22 +35,30 @@
using ::android::hardware::usb::V1_0::Status;
using ::android::hardware::usb::V1_1::PortMode_1_1;
using ::android::hardware::usb::V1_1::PortStatus_1_1;
-using ::android::hardware::usb::V1_2::IUsb;
using ::android::hardware::usb::V1_2::IUsbCallback;
using ::android::hardware::usb::V1_2::PortStatus;
+using ::android::hardware::usb::V1_3::IUsb;
using ::android::hidl::base::V1_0::DebugInfo;
using ::android::hidl::base::V1_0::IBase;
-enum class HALVersion { V1_0, V1_1, V1_2 };
+#define PULLUP_PATH "/config/usb_gadget/g1/UDC"
+constexpr char kGadgetName[] = "a600000.dwc3";
+#define SOC_PATH "/sys/devices/platform/soc/a600000.ssusb/"
+#define ID_PATH SOC_PATH "id"
+#define VBUS_PATH SOC_PATH "b_sess"
+#define USB_DATA_PATH SOC_PATH "usb_data_enabled"
+
+enum class HALVersion { V1_0, V1_1, V1_2, V1_3 };
struct Usb : public IUsb {
Usb();
- Return<void> switchRole(const hidl_string& portName, const V1_0::PortRole& role) override;
+ Return<void> switchRole(const hidl_string &portName, const PortRole &role) override;
Return<void> setCallback(const sp<V1_0::IUsbCallback>& callback) override;
Return<void> queryPortStatus() override;
Return<void> enableContaminantPresenceDetection(const hidl_string &portName, bool enable);
Return<void> enableContaminantPresenceProtection(const hidl_string &portName, bool enable);
+ Return<bool> enableUsbDataSignal(bool enable) override;
sp<V1_0::IUsbCallback> mCallback_1_0;
// Protects mCallback variable
@@ -67,7 +77,7 @@
};
} // namespace implementation
-} // namespace V1_2
+} // namespace V1_3
} // namespace usb
} // namespace hardware
} // namespace android
diff --git a/usb/android.hardware.usb@1.2-service.crosshatch.rc b/usb/android.hardware.usb@1.2-service.crosshatch.rc
deleted file mode 100644
index 7d9534c..0000000
--- a/usb/android.hardware.usb@1.2-service.crosshatch.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-service vendor.usb-hal-1-2 /vendor/bin/hw/android.hardware.usb@1.2-service.crosshatch
- class hal
- user root
- group root system shell mtp
-
-on boot
- chown root system /sys/class/typec/port0/power_role
- chown root system /sys/class/typec/port0/data_role
- chown root system /sys/class/typec/port0/port_type
- chmod 664 /sys/class/typec/port0/power_role
- chmod 664 /sys/class/typec/port0/data_role
- chmod 664 /sys/class/typec/port0/port_type
diff --git a/usb/android.hardware.usb@1.3-service.crosshatch.rc b/usb/android.hardware.usb@1.3-service.crosshatch.rc
new file mode 100644
index 0000000..2762bd0
--- /dev/null
+++ b/usb/android.hardware.usb@1.3-service.crosshatch.rc
@@ -0,0 +1,20 @@
+service vendor.usb-hal-1-3 /vendor/bin/hw/android.hardware.usb@1.3-service.crosshatch
+ class hal
+ user root
+ group root system shell mtp
+
+on boot
+ chown root system /sys/class/typec/port0/power_role
+ chown root system /sys/class/typec/port0/data_role
+ chown root system /sys/class/typec/port0/port_type
+ chmod 664 /sys/class/typec/port0/power_role
+ chmod 664 /sys/class/typec/port0/data_role
+ chmod 664 /sys/class/typec/port0/port_type
+
+on post-fs
+ chown root system /sys/devices/platform/soc/a600000.ssusb/b_sess
+ chown root system /sys/devices/platform/soc/a600000.ssusb/id
+ chown root system /sys/devices/platform/soc/a600000.ssusb/usb_data_enabled
+ chmod 664 /sys/devices/platform/soc/a600000.ssusb/b_sess
+ chmod 664 /sys/devices/platform/soc/a600000.ssusb/id
+ chmod 664 /sys/devices/platform/soc/a600000.ssusb/usb_data_enabled
diff --git a/usb/android.hardware.usb@1.2-service.crosshatch.xml b/usb/android.hardware.usb@1.3-service.crosshatch.xml
similarity index 89%
rename from usb/android.hardware.usb@1.2-service.crosshatch.xml
rename to usb/android.hardware.usb@1.3-service.crosshatch.xml
index 25ecf65..cd54268 100644
--- a/usb/android.hardware.usb@1.2-service.crosshatch.xml
+++ b/usb/android.hardware.usb@1.3-service.crosshatch.xml
@@ -2,7 +2,7 @@
<hal format="hidl">
<name>android.hardware.usb</name>
<transport>hwbinder</transport>
- <version>1.2</version>
+ <version>1.3</version>
<interface>
<name>IUsb</name>
<instance>default</instance>
diff --git a/usb/service.cpp b/usb/service.cpp
index 272b939..33c5b45 100644
--- a/usb/service.cpp
+++ b/usb/service.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#define LOG_TAG "android.hardware.usb@1.2-service.crosshatch"
+#define LOG_TAG "android.hardware.usb@1.3-service.crosshatch"
#include <hidl/HidlTransportSupport.h>
#include "Usb.h"
@@ -29,8 +29,8 @@
// Generated HIDL files
using android::hardware::usb::gadget::V1_1::IUsbGadget;
using android::hardware::usb::gadget::V1_1::implementation::UsbGadget;
-using android::hardware::usb::V1_2::IUsb;
-using android::hardware::usb::V1_2::implementation::Usb;
+using android::hardware::usb::V1_3::IUsb;
+using android::hardware::usb::V1_3::implementation::Usb;
using android::OK;
using android::status_t;
diff --git a/vf/OWNERS b/vf/OWNERS
new file mode 100644
index 0000000..d3c5d2d
--- /dev/null
+++ b/vf/OWNERS
@@ -0,0 +1,6 @@
+# Treble team for Vendor Freeze
+bpeckham@google.com
+chrisgross@google.com
+danielnorman@google.com
+inseob@google.com
+justinyun@google.com
diff --git a/vf/aosp_crosshatch_vf.mk b/vf/aosp_crosshatch_vf.mk
new file mode 100644
index 0000000..703b172
--- /dev/null
+++ b/vf/aosp_crosshatch_vf.mk
@@ -0,0 +1,33 @@
+#
+# Copyright 2020 The Android Open Source Project
+#
+# 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.
+#
+
+# Makefile for the system-only partial build of aosp_crosshatch.
+# Used for creating a merged Vendor Freeze device.
+
+# Include VNDK v30, needed by the Android 11 vendor half.
+PRODUCT_EXTRA_VNDK_VERSIONS = 30
+
+# Disable building certain non-system partitions in this build.
+PRODUCT_BUILD_BOOT_IMAGE := false
+PRODUCT_BUILD_RAMDISK_IMAGE := false
+PRODUCT_BUILD_RECOVERY_IMAGE := false
+PRODUCT_BUILD_VBMETA_IMAGE := false
+PRODUCT_BUILD_VENDOR_IMAGE := false
+PRODUCT_BUILD_VENDOR_BOOT_IMAGE := false
+
+$(call inherit-product, device/google/crosshatch/aosp_crosshatch.mk)
+
+PRODUCT_NAME := aosp_crosshatch_vf
diff --git a/vf/framework_item_list.txt b/vf/framework_item_list.txt
new file mode 100644
index 0000000..6621c49
--- /dev/null
+++ b/vf/framework_item_list.txt
@@ -0,0 +1,22 @@
+IMAGES/product.img
+IMAGES/product.map
+IMAGES/system_ext.img
+IMAGES/system_ext.map
+IMAGES/system.img
+IMAGES/system.map
+IMAGES/system_other.img
+IMAGES/userdata.img
+META/apexkeys.txt
+META/apkcerts.txt
+META/filesystem_config.txt
+META/postinstall_config.txt
+META/product_filesystem_config.txt
+META/root_filesystem_config.txt
+META/system_ext_filesystem_config.txt
+META/system_other_filesystem_config.txt
+META/update_engine_config.txt
+PRODUCT/*
+ROOT/*
+SYSTEM/*
+SYSTEM_EXT/*
+SYSTEM_OTHER/*
diff --git a/vf/framework_misc_info_keys.txt b/vf/framework_misc_info_keys.txt
new file mode 100644
index 0000000..128dda8
--- /dev/null
+++ b/vf/framework_misc_info_keys.txt
@@ -0,0 +1,17 @@
+ab_update
+avb_product_add_hashtree_footer_args
+avb_product_hashtree_enable
+avb_system_add_hashtree_footer_args
+avb_system_ext_add_hashtree_footer_args
+avb_system_ext_hashtree_enable
+avb_system_hashtree_enable
+avb_system_other_add_hashtree_footer_args
+avb_system_other_hashtree_enable
+building_product_image
+building_system_ext_image
+building_system_image
+building_system_other_image
+default_system_dev_certificate
+product_fs_type
+root_dir
+system_ext_fs_type
diff --git a/vf/vendor_item_list.txt b/vf/vendor_item_list.txt
new file mode 100644
index 0000000..a86378c
--- /dev/null
+++ b/vf/vendor_item_list.txt
@@ -0,0 +1,21 @@
+BOOT/*
+DATA/*
+IMAGES/boot.img
+IMAGES/dtbo.img
+IMAGES/vendor_boot.img
+IMAGES/vendor.img
+IMAGES/vendor.map
+META/boot_filesystem_config.txt
+META/care_map.pb
+META/kernel_configs.txt
+META/kernel_version.txt
+META/otakeys.txt
+META/releasetools.py
+META/vendor_boot_filesystem_config.txt
+META/vendor_filesystem_config.txt
+ODM/*
+OTA/android-info.txt
+PREBUILT_IMAGES/*
+RADIO/*
+VENDOR/*
+VENDOR_BOOT/*
