Merge tag 'android-14.0.0_r29' into staging/lineage-21.0_merge-android-14.0.0_r29
Android 14.0.0 release 29
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZW5gAKCRDorT+BmrEO
# eEbyAJ4r9s7fUoxGE4kc6nGVcl4EB3Qj4QCfS3lPWQ8B2wk4QP/9+l9B8Zxqs0A=
# =IaoM
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar 5 01:19:02 2024 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2355 signatures in the past
# 2 years. Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Georg Veichtlbauer (1) and Tomasz Wasilczyk (1)
# Via Automerger Merge Worker (38) and others
* tag 'android-14.0.0_r29':
dicttoolkit: pin cpp_std to gnu++17
Fix erroneous LXX theme text color mappings
Change-Id: I8dad406ebefc14db426a668ad93313ba68be5077
diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index cae1f72..ae8dd1d 100644
--- a/java/res/values/themes-lxx-dark.xml
+++ b/java/res/values/themes-lxx-dark.xml
@@ -47,8 +47,8 @@
<item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_lxx_dark</item>
<item name="spacebarBackground">@drawable/btn_keyboard_spacebar_lxx_dark</item>
<item name="keyTextColor">@color/key_text_color_lxx_dark</item>
- <item name="keyTextInactivatedColor">@color/key_functional_text_color_lxx_dark</item>
- <item name="functionalTextColor">@color/key_text_color_lxx_dark</item>
+ <item name="keyTextInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
+ <item name="functionalTextColor">@color/key_functional_text_color_lxx_dark</item>
<item name="keyHintLetterColor">@color/key_hint_letter_color_lxx_dark</item>
<item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
<item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp
index 4ae250f..6560d65 100644
--- a/native/dicttoolkit/Android.bp
+++ b/native/dicttoolkit/Android.bp
@@ -24,6 +24,7 @@
cc_defaults {
name: "dicttoolkit_defaults",
+ cpp_std: "gnu++17",
cflags: [
"-Werror",
"-Wall",