From b8f9174195fdf38aad6a1f5aca8ee95f15d6dbee Mon Sep 17 00:00:00 2001
From: Georg Veichtlbauer <georg@vware.at>
Date: Wed, 23 Aug 2023 09:34:35 +0200
Subject: [PATCH 1/2] Fix erroneous LXX theme text color mappings

keyTextInactivatedColor and functionalTextColor were wrongly
assigned, eventhough correct definitions already exist.

Change-Id: I06694447ee22fb609267aa2256a36a2585ad6b3f
---
 java/res/values/themes-lxx-dark.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/res/values/themes-lxx-dark.xml b/java/res/values/themes-lxx-dark.xml
index cae1f72438..ae8dd1de28 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>

From 8c97f47adeb74567a9bf162ae25a82001928b970 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Wed, 15 Nov 2023 09:27:39 -0800
Subject: [PATCH 2/2] dicttoolkit: pin cpp_std to gnu++17

This project doesn't build with gnu++20 and prevents AOSP default to be
upgraded to a newer standard. Once the build failure is fixed here, this
change can be reverted.

Bug: 311052584
Test: m checkbuild
Change-Id: If2d19c1b6d970703a1dbf7685588a4a4be5a53c1
---
 native/dicttoolkit/Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp
index 4ae250fa22..6560d654a3 100644
--- a/native/dicttoolkit/Android.bp
+++ b/native/dicttoolkit/Android.bp
@@ -24,6 +24,7 @@ package {
 cc_defaults {
     name: "dicttoolkit_defaults",
 
+    cpp_std: "gnu++17",
     cflags: [
         "-Werror",
         "-Wall",