diff options
| author | Xin Li <delphij@google.com> | 2022-04-01 20:32:26 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2022-04-01 20:32:26 +0000 |
| commit | 173c915e211abdbbfa2d6d81739068fb75d2ea3c (patch) | |
| tree | 595a1fd9ef0e8e6c27c01ef592abc969c4f832d3 | |
| parent | a792743b2b2ed2756c7803aefaa0d817883c2ff5 (diff) | |
| parent | 1957a2f176fcb0d0c7b61086b079807d92c87c38 (diff) | |
| download | google_car-173c915e211abdbbfa2d6d81739068fb75d2ea3c.tar.gz | |
Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I135da561a26b493278b71e994bbdb1d23355998d
Change-Id: Iffade0011cd939d1c8c725cc4e7031e1a6f3d245
| -rw-r--r-- | common/overlay/frameworks/base/core/res/res/values/config.xml | 15 | ||||
| -rw-r--r-- | common/post_google_car.mk | 3 | ||||
| -rw-r--r-- | oriole_car/BoardConfig.mk | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/common/overlay/frameworks/base/core/res/res/values/config.xml b/common/overlay/frameworks/base/core/res/res/values/config.xml new file mode 100644 index 0000000..e69f5e1 --- /dev/null +++ b/common/overlay/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,15 @@ +<resources> +<!-- Control the behavior when the user long presses the power button. + 0 - Nothing + 1 - Global actions menu + 2 - Power off (with confirmation) + 3 - Power off (without confirmation) + 4 - Go to voice assist + --> + <integer name="config_longPressOnPowerBehavior">1</integer> + + <bool name="config_single_volume">true</bool> + + <!-- Disable lockscreen sound effect --> + <integer name="def_lockscreen_sounds_enabled">0</integer> +</resources> diff --git a/common/post_google_car.mk b/common/post_google_car.mk index 300cf0e..ab5456b 100644 --- a/common/post_google_car.mk +++ b/common/post_google_car.mk @@ -43,7 +43,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.boot.wificountrycode=00 \ + ro.config.media_vol_default=0 \ log.tag.CarTrustAgentUnlockEvent=I # Phone car targets don't support ramdump -EXCLUDE_BUILD_RAMDUMP_UPLOADER_DEBUG_TOOL := true
\ No newline at end of file +EXCLUDE_BUILD_RAMDUMP_UPLOADER_DEBUG_TOOL := true diff --git a/oriole_car/BoardConfig.mk b/oriole_car/BoardConfig.mk index f612c93..5b5230c 100644 --- a/oriole_car/BoardConfig.mk +++ b/oriole_car/BoardConfig.mk @@ -20,7 +20,7 @@ # * TARGET_SCREEN_DENSITY is scaled down by 1.75x TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt -TARGET_BOOTLOADER_BOARD_NAME := raviole +TARGET_BOOTLOADER_BOARD_NAME := oriole TARGET_SCREEN_DENSITY := 240 USES_DEVICE_GOOGLE_RAVIOLE := true |