From b5b72a0fe0d4b5d3d68a24d838d7961dfc395698 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Mon, 6 Sep 2021 23:12:58 +0600
Subject: [PATCH 1/7] 3736-Q-Set_voice_input_key_preference_default_false

issue: https://gitlab.e.foundation/e/backlog/-/issues/3736
---
 java/res/xml/prefs_screen_preferences.xml                       | 2 +-
 .../com/android/inputmethod/latin/settings/SettingsValues.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/res/xml/prefs_screen_preferences.xml b/java/res/xml/prefs_screen_preferences.xml
index 101edc8557..540f9f6a6a 100644
--- a/java/res/xml/prefs_screen_preferences.xml
+++ b/java/res/xml/prefs_screen_preferences.xml
@@ -48,6 +48,6 @@
     <CheckBoxPreference
         android:key="pref_voice_input_key"
         android:title="@string/voice_input"
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:persistent="true" />
 </PreferenceScreen>
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
index 7a276a6a4d..74884645e2 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsValues.java
@@ -366,7 +366,7 @@ public class SettingsValues {
                     .remove(Settings.PREF_VOICE_MODE_OBSOLETE)
                     .apply();
         }
-        return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, true);
+        return prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, false);
     }
 
     public String dump() {
-- 
GitLab


From 5e43d11330304273f1e7e837c6b0a6f5987b98bf Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Wed, 4 May 2022 14:08:43 +0000
Subject: [PATCH 2/7] LatinIME: Force disable ime key once again for old
 updating users

---
 .../inputmethod/latin/SystemBroadcastReceiver.java   | 12 ++++++++++++
 .../android/inputmethod/latin/settings/Settings.java |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
index 90221512ff..109cace92f 100644
--- a/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
+++ b/java/src/com/android/inputmethod/latin/SystemBroadcastReceiver.java
@@ -86,6 +86,7 @@ public final class SystemBroadcastReceiver extends BroadcastReceiver {
         } else if (Intent.ACTION_BOOT_COMPLETED.equals(intentAction)) {
             Log.i(TAG, "Boot has been completed");
             toggleAppIcon(context);
+            disableVoiceKey(context);
         } else if (Intent.ACTION_LOCALE_CHANGED.equals(intentAction)) {
             Log.i(TAG, "System locale changed");
             KeyboardLayoutSet.onSystemLocaleChanged();
@@ -156,4 +157,15 @@ public final class SystemBroadcastReceiver extends BroadcastReceiver {
                         : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
     }
+
+    public static void disableVoiceKey(final Context context) {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        if (prefs.getBoolean(Settings.PREF_VOICE_INPUT_KEY, false) &&
+                !prefs.getBoolean(Settings.PREF_FORCED_DISABLE_VOICE_INPUT_KEY, false)) {
+            prefs.edit()
+               .putBoolean(Settings.PREF_VOICE_INPUT_KEY, false)
+               .putBoolean(Settings.PREF_FORCED_DISABLE_VOICE_INPUT_KEY, true)
+               .apply();
+        }
+    }
 }
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 8a1a8a390b..83cc74e5e2 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@@ -58,6 +58,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     // PREF_VOICE_MODE_OBSOLETE is obsolete. Use PREF_VOICE_INPUT_KEY instead.
     public static final String PREF_VOICE_MODE_OBSOLETE = "voice_mode";
     public static final String PREF_VOICE_INPUT_KEY = "pref_voice_input_key";
+    // Added by /e/ to disable old enabled voice key
+    public static final String PREF_FORCED_DISABLE_VOICE_INPUT_KEY = "pref_forced_disable_voice_input_key";
     public static final String PREF_EDIT_PERSONAL_DICTIONARY = "edit_personal_dictionary";
     public static final String PREF_CONFIGURE_DICTIONARIES_KEY = "configure_dictionaries_key";
     // PREF_AUTO_CORRECTION_THRESHOLD_OBSOLETE is obsolete. Use PREF_AUTO_CORRECTION instead.
-- 
GitLab


From 0df78b2d928fe1752656ddbe9bf20d3240322094 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 10 Oct 2022 16:43:36 +0530
Subject: [PATCH 3/7] Theme app according to our palette

---
 java/Android.bp                               |  1 +
 java/AndroidManifest.xml                      |  2 +-
 .../drawable-night/ic_emoji_activity_you.xml  | 33 +++++++++++++++++
 .../drawable-night/ic_emoji_emoticons_you.xml | 32 +++++++++++++++++
 java/res/drawable-night/ic_emoji_flag_you.xml | 33 +++++++++++++++++
 java/res/drawable-night/ic_emoji_food_you.xml | 33 +++++++++++++++++
 .../drawable-night/ic_emoji_nature_you.xml    | 33 +++++++++++++++++
 .../drawable-night/ic_emoji_objects_you.xml   | 32 +++++++++++++++++
 .../drawable-night/ic_emoji_people_you.xml    | 32 +++++++++++++++++
 .../drawable-night/ic_emoji_places_you.xml    | 32 +++++++++++++++++
 .../drawable-night/ic_emoji_recents_you.xml   | 32 +++++++++++++++++
 .../drawable-night/ic_emoji_symbols_you.xml   | 32 +++++++++++++++++
 .../btn_keyboard_key_enter_normal_you.xml     | 26 ++++++++++++++
 .../btn_keyboard_key_enter_pressed_you.xml    | 26 ++++++++++++++
 .../drawable/btn_keyboard_key_enter_you.xml   | 21 +++++++++++
 java/res/drawable/ic_emoji_activity_you.xml   | 33 +++++++++++++++++
 java/res/drawable/ic_emoji_emoticons_you.xml  | 32 +++++++++++++++++
 java/res/drawable/ic_emoji_flag_you.xml       | 33 +++++++++++++++++
 java/res/drawable/ic_emoji_food_you.xml       | 33 +++++++++++++++++
 java/res/drawable/ic_emoji_nature_you.xml     | 33 +++++++++++++++++
 java/res/drawable/ic_emoji_objects_you.xml    | 32 +++++++++++++++++
 java/res/drawable/ic_emoji_people_you.xml     | 32 +++++++++++++++++
 java/res/drawable/ic_emoji_places_you.xml     | 32 +++++++++++++++++
 java/res/drawable/ic_emoji_recents_you.xml    | 32 +++++++++++++++++
 java/res/drawable/ic_emoji_symbols_you.xml    | 32 +++++++++++++++++
 java/res/drawable/sym_keyboard_delete_you.xml | 12 +++----
 .../sym_keyboard_language_switch_you.xml      |  2 +-
 java/res/drawable/sym_keyboard_send_you.xml   | 12 +++----
 .../drawable/sym_keyboard_settings_you.xml    | 10 +++---
 java/res/drawable/sym_keyboard_shift_you.xml  | 20 ++++-------
 java/res/drawable/sym_keyboard_smiley_you.xml |  9 +++--
 java/res/values-night/themes-you-colors.xml   | 11 ------
 java/res/values/attrs.xml                     |  5 +++
 java/res/values/themes-you-colors.xml         | 23 ++++++------
 java/res/values/themes-you.xml                | 35 ++++++++++---------
 java/res/xml/key_styles_enter.xml             |  2 +-
 .../com/android/inputmethod/keyboard/Key.java |  9 ++++-
 .../inputmethod/keyboard/KeyboardView.java    |  6 +++-
 .../android/inputmethod/latin/LatinIME.java   |  2 +-
 39 files changed, 802 insertions(+), 80 deletions(-)
 create mode 100644 java/res/drawable-night/ic_emoji_activity_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_emoticons_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_flag_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_food_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_nature_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_objects_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_people_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_places_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_recents_you.xml
 create mode 100644 java/res/drawable-night/ic_emoji_symbols_you.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_enter_normal_you.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_enter_pressed_you.xml
 create mode 100644 java/res/drawable/btn_keyboard_key_enter_you.xml
 create mode 100644 java/res/drawable/ic_emoji_activity_you.xml
 create mode 100644 java/res/drawable/ic_emoji_emoticons_you.xml
 create mode 100644 java/res/drawable/ic_emoji_flag_you.xml
 create mode 100644 java/res/drawable/ic_emoji_food_you.xml
 create mode 100644 java/res/drawable/ic_emoji_nature_you.xml
 create mode 100644 java/res/drawable/ic_emoji_objects_you.xml
 create mode 100644 java/res/drawable/ic_emoji_people_you.xml
 create mode 100644 java/res/drawable/ic_emoji_places_you.xml
 create mode 100644 java/res/drawable/ic_emoji_recents_you.xml
 create mode 100644 java/res/drawable/ic_emoji_symbols_you.xml

diff --git a/java/Android.bp b/java/Android.bp
index 613b451488..12ea76e946 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -45,6 +45,7 @@ android_app {
         "jsr305",
         "latinime-common",
         "androidx.legacy_legacy-support-v4",
+        "elib",
     ],
 
     // Do not compress dictionary files to mmap dict data runtime
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 8c3bc005f4..8b02fa595c 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -19,7 +19,7 @@
      package="com.android.inputmethod.latin"
      android:versionCode="30">
 
-    <uses-sdk android:minSdkVersion="21"
+    <uses-sdk android:minSdkVersion="29"
          android:targetSdkVersion="30"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/java/res/drawable-night/ic_emoji_activity_you.xml b/java/res/drawable-night/ic_emoji_activity_you.xml
new file mode 100644
index 0000000000..b916d4f9e1
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_activity_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_activity_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_emoticons_you.xml b/java/res/drawable-night/ic_emoji_emoticons_you.xml
new file mode 100644
index 0000000000..a8f167ac38
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_emoticons_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_flag_you.xml b/java/res/drawable-night/ic_emoji_flag_you.xml
new file mode 100644
index 0000000000..8bd0fd7451
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_flag_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_flag_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_food_you.xml b/java/res/drawable-night/ic_emoji_food_you.xml
new file mode 100644
index 0000000000..19d7d57007
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_food_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_food_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_nature_you.xml b/java/res/drawable-night/ic_emoji_nature_you.xml
new file mode 100644
index 0000000000..6f03e50b47
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_nature_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_nature_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_objects_you.xml b/java/res/drawable-night/ic_emoji_objects_you.xml
new file mode 100644
index 0000000000..cf150f4120
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_objects_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_people_you.xml b/java/res/drawable-night/ic_emoji_people_you.xml
new file mode 100644
index 0000000000..f91b5c4f3c
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_people_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_people_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_places_you.xml b/java/res/drawable-night/ic_emoji_places_you.xml
new file mode 100644
index 0000000000..ace036465e
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_places_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_places_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_recents_you.xml b/java/res/drawable-night/ic_emoji_recents_you.xml
new file mode 100644
index 0000000000..50f0e086b0
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_recents_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_symbols_you.xml b/java/res/drawable-night/ic_emoji_symbols_you.xml
new file mode 100644
index 0000000000..d2dbc220d4
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_symbols_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key_enter_normal_you.xml b/java/res/drawable/btn_keyboard_key_enter_normal_you.xml
new file mode 100644
index 0000000000..eea5571d2a
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_enter_normal_you.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/keyboard_key_enter_normal_color_you" />
+
+    <padding android:left="1dp"
+             android:top="1dp"
+             android:right="1dp"
+             android:bottom="1dp" />
+
+    <corners android:radius="@dimen/keyboard_key_corner_radius_you" />
+</shape>
diff --git a/java/res/drawable/btn_keyboard_key_enter_pressed_you.xml b/java/res/drawable/btn_keyboard_key_enter_pressed_you.xml
new file mode 100644
index 0000000000..413b9cbb54
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_enter_pressed_you.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/keyboard_key_enter_pressed_color_you"/>
+             
+    <padding android:left="1dp"
+             android:top="1dp"
+             android:right="1dp"
+             android:bottom="1dp" />
+
+    <corners android:radius="@dimen/keyboard_key_corner_radius_you" />
+</shape>
diff --git a/java/res/drawable/btn_keyboard_key_enter_you.xml b/java/res/drawable/btn_keyboard_key_enter_you.xml
new file mode 100644
index 0000000000..e5491baa7c
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_enter_you.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_enter_pressed_you" />
+    <item android:drawable="@drawable/btn_keyboard_key_enter_normal_you" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_activity_you.xml b/java/res/drawable/ic_emoji_activity_you.xml
new file mode 100644
index 0000000000..801f8950a8
--- /dev/null
+++ b/java/res/drawable/ic_emoji_activity_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_activity_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_emoticons_you.xml b/java/res/drawable/ic_emoji_emoticons_you.xml
new file mode 100644
index 0000000000..e1820906b1
--- /dev/null
+++ b/java/res/drawable/ic_emoji_emoticons_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_flag_you.xml b/java/res/drawable/ic_emoji_flag_you.xml
new file mode 100644
index 0000000000..3632cfe581
--- /dev/null
+++ b/java/res/drawable/ic_emoji_flag_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_flag_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_food_you.xml b/java/res/drawable/ic_emoji_food_you.xml
new file mode 100644
index 0000000000..9da2c48fdb
--- /dev/null
+++ b/java/res/drawable/ic_emoji_food_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_food_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_nature_you.xml b/java/res/drawable/ic_emoji_nature_you.xml
new file mode 100644
index 0000000000..47525ad94c
--- /dev/null
+++ b/java/res/drawable/ic_emoji_nature_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_nature_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_objects_you.xml b/java/res/drawable/ic_emoji_objects_you.xml
new file mode 100644
index 0000000000..be7f32f785
--- /dev/null
+++ b/java/res/drawable/ic_emoji_objects_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_people_you.xml b/java/res/drawable/ic_emoji_people_you.xml
new file mode 100644
index 0000000000..88394bf77a
--- /dev/null
+++ b/java/res/drawable/ic_emoji_people_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_people_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_places_you.xml b/java/res/drawable/ic_emoji_places_you.xml
new file mode 100644
index 0000000000..93d74f773b
--- /dev/null
+++ b/java/res/drawable/ic_emoji_places_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_places_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_recents_you.xml b/java/res/drawable/ic_emoji_recents_you.xml
new file mode 100644
index 0000000000..f06480c512
--- /dev/null
+++ b/java/res/drawable/ic_emoji_recents_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_you.xml b/java/res/drawable/ic_emoji_symbols_you.xml
new file mode 100644
index 0000000000..fb59399f5c
--- /dev/null
+++ b/java/res/drawable/ic_emoji_symbols_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/sym_keyboard_delete_you.xml b/java/res/drawable/sym_keyboard_delete_you.xml
index 0cd188692d..4ebc1a8801 100644
--- a/java/res/drawable/sym_keyboard_delete_you.xml
+++ b/java/res/drawable/sym_keyboard_delete_you.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88L0,12L5.41,20.11C5.77,20.64 6.31,21 7,21H22A2,2 0 0,0 24,19V5A2,2 0 0,0 22,3M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12" />
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@color/functional_text_color_you"
+      android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM22,19L7.07,19L2.4,12l4.66,-7L22,5v14zM10.41,17L14,13.41 17.59,17 19,15.59 15.41,12 19,8.41 17.59,7 14,10.59 10.41,7 9,8.41 12.59,12 9,15.59z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_language_switch_you.xml b/java/res/drawable/sym_keyboard_language_switch_you.xml
index a110e2ab0c..9bfbc9274c 100644
--- a/java/res/drawable/sym_keyboard_language_switch_you.xml
+++ b/java/res/drawable/sym_keyboard_language_switch_you.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/icon_color_you"
+        android:fillColor="@color/functional_text_color_you"
         android:pathData="M16.36,14C16.44,13.34 16.5,12.68 16.5,12C16.5,11.32 16.44,10.66 16.36,10H19.74C19.9,10.64 20,11.31 20,12C20,12.69 19.9,13.36 19.74,14M14.59,19.56C15.19,18.45 15.65,17.25 15.97,16H18.92C17.96,17.65 16.43,18.93 14.59,19.56M14.34,14H9.66C9.56,13.34 9.5,12.68 9.5,12C9.5,11.32 9.56,10.65 9.66,10H14.34C14.43,10.65 14.5,11.32 14.5,12C14.5,12.68 14.43,13.34 14.34,14M12,19.96C11.17,18.76 10.5,17.43 10.09,16H13.91C13.5,17.43 12.83,18.76 12,19.96M8,8H5.08C6.03,6.34 7.57,5.06 9.4,4.44C8.8,5.55 8.35,6.75 8,8M5.08,16H8C8.35,17.25 8.8,18.45 9.4,19.56C7.57,18.93 6.03,17.65 5.08,16M4.26,14C4.1,13.36 4,12.69 4,12C4,11.31 4.1,10.64 4.26,10H7.64C7.56,10.66 7.5,11.32 7.5,12C7.5,12.68 7.56,13.34 7.64,14M12,4.03C12.83,5.23 13.5,6.57 13.91,8H10.09C10.5,6.57 11.17,5.23 12,4.03M18.92,8H15.97C15.65,6.75 15.19,5.55 14.59,4.44C16.43,5.07 17.96,6.34 18.92,8M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
diff --git a/java/res/drawable/sym_keyboard_send_you.xml b/java/res/drawable/sym_keyboard_send_you.xml
index 674c9c1e31..6f8bbdb430 100644
--- a/java/res/drawable/sym_keyboard_send_you.xml
+++ b/java/res/drawable/sym_keyboard_send_you.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M2,21L23,12L2,3V10L17,12L2,14V21Z" />
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@color/icon_color_you"
+      android:pathData="M4.01,6.03l7.51,3.22 -7.52,-1 0.01,-2.22m7.5,8.72L4,17.97v-2.22l7.51,-1M2.01,3L2,10l15,2 -15,2 0.01,7L23,12 2.01,3z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_settings_you.xml b/java/res/drawable/sym_keyboard_settings_you.xml
index 1f47957a2e..954f098efa 100644
--- a/java/res/drawable/sym_keyboard_settings_you.xml
+++ b/java/res/drawable/sym_keyboard_settings_you.xml
@@ -1,11 +1,9 @@
-<!-- drawable/cog.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
+  <path
+      android:fillColor="@color/functional_text_color_you"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_shift_you.xml b/java/res/drawable/sym_keyboard_shift_you.xml
index dbe359e4d9..af3d6418dc 100644
--- a/java/res/drawable/sym_keyboard_shift_you.xml
+++ b/java/res/drawable/sym_keyboard_shift_you.xml
@@ -1,15 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:translateY="24"
-        android:translateX="24"
-        android:rotation="180">
-
-        <path
-            android:fillColor="@color/shift_normal_color_you"
-            android:pathData="M9,4H15V12H19.84L12,19.84L4.16,12H9V4Z" />
-    </group>
+    android:width="20dp"
+    android:height="16dp"
+    android:viewportWidth="20"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M12.75,13.5V8H14.739L10,3.261L5.261,8H7.25V13.5H12.75ZM10,0.667L19.167,9.833H14.583V15.333H5.417V9.833H0.833L10,0.667Z"
+      android:fillColor="@color/shift_normal_color_you"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_smiley_you.xml b/java/res/drawable/sym_keyboard_smiley_you.xml
index c86ede3cca..22953cda94 100644
--- a/java/res/drawable/sym_keyboard_smiley_you.xml
+++ b/java/res/drawable/sym_keyboard_smiley_you.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M15.5,8A1.5,1.5 0 0,1 17,9.5A1.5,1.5 0 0,1 15.5,11A1.5,1.5 0 0,1 14,9.5A1.5,1.5 0 0,1 15.5,8M8.5,8A1.5,1.5 0 0,1 10,9.5A1.5,1.5 0 0,1 8.5,11A1.5,1.5 0 0,1 7,9.5A1.5,1.5 0 0,1 8.5,8M12,17.5C9.67,17.5 7.69,16.04 6.89,14H17.11C16.3,16.04 14.33,17.5 12,17.5Z" />
+  <path
+      android:fillColor="@color/functional_text_color_you"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z"/>
 </vector>
diff --git a/java/res/values-night/themes-you-colors.xml b/java/res/values-night/themes-you-colors.xml
index 91e09754aa..7b0c9bef07 100644
--- a/java/res/values-night/themes-you-colors.xml
+++ b/java/res/values-night/themes-you-colors.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_neutral1_1000</color>
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_800</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_900</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_accent1_10</color>
-    <color name="functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="category_page_indicator_color">@android:color/system_accent3_200</color>
-    <color name="icon_color_you">@android:color/system_accent3_100</color>
-    <color name="functional_normal_color_you">@android:color/system_neutral2_800</color>
-    <color name="functional_pressed_color_you">@android:color/system_neutral2_900</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_400</color>
-    <color name="shift_locked_color_you">@android:color/system_accent1_10</color>
     <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_dark</color>
     <color name="typed_word_color_you">@color/typed_word_color_lxx_dark</color>
     <color name="auto_correct_color_you">@color/auto_correct_color_lxx_dark</color>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 69a5d59afc..1b9bb52262 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -52,6 +52,10 @@
              {@link android.graphics.drawable.StateListDrawable}, with the following possible
              states: normal, pressed. -->
         <attr name="functionalKeyBackground" format="reference" />
+        <!-- Background image for the enterkey.  This image needs to be a
+             {@link android.graphics.drawable.StateListDrawable}, with the following possible
+             states: normal, pressed. -->
+        <attr name="enterKeyBackground" format="reference" />
         <!-- Background image for the spacebar.  This image needs to be a
              {@link android.graphics.drawable.StateListDrawable}, with the following possible
              states: normal, pressed. -->
@@ -314,6 +318,7 @@
             <enum name="stickyOn" value="4" />
             <enum name="action" value="5" />
             <enum name="spacebar" value="6" />
+            <enum name="enter" value="7" />
         </attr>
         <!-- The key action flags. -->
         <attr name="keyActionFlags" format="integer">
diff --git a/java/res/values/themes-you-colors.xml b/java/res/values/themes-you-colors.xml
index 5a9fa40cba..e73e5eafd6 100644
--- a/java/res/values/themes-you-colors.xml
+++ b/java/res/values/themes-you-colors.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_accent3_10</color>
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_100</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_200</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_accent1_900</color>
+    <color name="keyboard_background_you">@color/e_keyboard_background</color>
+    <color name="keyboard_key_normal_color_you">@color/e_keyboard_key_background</color>
+    <color name="keyboard_key_pressed_color_you">@color/e_keyboard_key_pressed_background</color>
+    <color name="keyboard_key_text_color_you">@color/e_keyboard_key_text</color>
     <color name="functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="category_page_indicator_color">@android:color/system_accent3_200</color>
-    <color name="icon_color_you">@android:color/system_accent3_800</color>
-    <color name="functional_normal_color_you">@android:color/system_neutral2_100</color>
-    <color name="functional_pressed_color_you">@android:color/system_neutral2_200</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_800</color>
-    <color name="shift_locked_color_you">@android:color/system_accent1_1000</color>
+    <color name="category_page_indicator_color">@color/e_accent</color>
+    <color name="icon_color_you">@color/keyboard_background_you</color>
+    <color name="functional_normal_color_you">@color/e_keyboard_functional_background</color>
+    <color name="functional_pressed_color_you">@color/e_keyboard_functional_pressed_background</color>
+    <color name="keyboard_key_enter_normal_color_you">@color/e_keyboard_key_enter_background</color>
+    <color name="keyboard_key_enter_pressed_color_you">@color/e_keyboard_key_enter_pressed_background</color>
+    <color name="shift_normal_color_you">@color/functional_text_color_you</color>
+    <color name="shift_locked_color_you">@color/functional_text_color_you</color>
     <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_light</color>
     <color name="typed_word_color_you">@color/typed_word_color_lxx_light</color>
     <color name="auto_correct_color_you">@color/auto_correct_color_lxx_light</color>
@@ -18,4 +20,5 @@
     <color name="highlight_color_you">@color/highlight_color_lxx_light</color>
     <color name="gesture_trail_color_you">@android:color/system_accent3_800</color>
     <color name="gesture_floating_preview_text_color_you">@android:color/system_neutral1_1000</color>
+    <color name="keyboard_navigation_bar">@color/keyboard_background_you</color>
 </resources>
diff --git a/java/res/values/themes-you.xml b/java/res/values/themes-you.xml
index a17e4bb44e..49a03b9765 100644
--- a/java/res/values/themes-you.xml
+++ b/java/res/values/themes-you.xml
@@ -74,6 +74,7 @@
         <item name="keyBackground">@drawable/btn_keyboard_key_you</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_you</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_you</item>
+        <item name="enterKeyBackground">@drawable/btn_keyboard_key_enter_you</item>
         <item name="keyTextColor">@color/keyboard_key_text_color_you</item>
         <item name="keyTextInactivatedColor">@color/functional_text_color_you</item>
         <item name="functionalTextColor">@color/functional_text_color_you</item>
@@ -113,23 +114,23 @@
         <item name="categoryIndicatorEnabled">false</item>
         <item name="categoryPageIndicatorColor">@color/category_page_indicator_color</item>
         <item name="categoryPageIndicatorBackground">@null</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_dark</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_lxx_dark</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_lxx_dark</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_lxx_dark</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_dark</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_lxx_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_lxx_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_lxx_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_lxx_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_lxx_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_lxx_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_lxx_dark</item>
+        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_you</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_you</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_you</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_you</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_you</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_you</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_you</item>
+        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_you</item>
+        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_you</item>
+        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_you</item>
+        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_you</item>
+        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_you</item>
+        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_you</item>
+        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_you</item>
+        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_you</item>
+        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_you</item>
+        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_you</item>
     </style>
     <style
         name="MoreKeysKeyboard.You"
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 562278e3aa..50bac2fc32 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -229,7 +229,7 @@
                 latin:keySpec="!icon/enter_key|!code/key_enter"
                 latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
                 latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional"
+                latin:backgroundType="enter"
                 latin:parentStyle="navigateMoreKeysStyle" />
         </case>
         <!-- keyboardTheme="LXXLight|LXXDark" -->
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 299d1b7c5e..3f85fd16e5 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -156,6 +156,7 @@ public class Key implements Comparable<Key> {
     public static final int BACKGROUND_TYPE_STICKY_ON = 4;
     public static final int BACKGROUND_TYPE_ACTION = 5;
     public static final int BACKGROUND_TYPE_SPACEBAR = 6;
+    public static final int BACKGROUND_TYPE_ENTER = 7;
 
     private final int mActionFlags;
     private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01;
@@ -555,6 +556,7 @@ public class Key implements Comparable<Key> {
         case BACKGROUND_TYPE_STICKY_ON: return "stickyOn";
         case BACKGROUND_TYPE_ACTION: return "action";
         case BACKGROUND_TYPE_SPACEBAR: return "spacebar";
+        case BACKGROUND_TYPE_ENTER: return "enter";
         default: return null;
         }
     }
@@ -978,6 +980,8 @@ public class Key implements Comparable<Key> {
             new KeyBackgroundState(android.R.attr.state_active),
             // 6: BACKGROUND_TYPE_SPACEBAR
             new KeyBackgroundState(),
+            // 7: BACKGROUND_TYPE_ENTER
+            new KeyBackgroundState(),
         };
     }
 
@@ -989,12 +993,15 @@ public class Key implements Comparable<Key> {
     @Nonnull
     public final Drawable selectBackgroundDrawable(@Nonnull final Drawable keyBackground,
             @Nonnull final Drawable functionalKeyBackground,
+            @Nonnull final Drawable enterBackground,
             @Nonnull final Drawable spacebarBackground) {
         final Drawable background;
-        if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL) {
+        if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL || mBackgroundType == BACKGROUND_TYPE_STICKY_OFF || mBackgroundType == BACKGROUND_TYPE_STICKY_ON) {
             background = functionalKeyBackground;
         } else if (mBackgroundType == BACKGROUND_TYPE_SPACEBAR) {
             background = spacebarBackground;
+        } else if (mBackgroundType == BACKGROUND_TYPE_ENTER) {
+            background = enterBackground;
         } else {
             background = keyBackground;
         }
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index cd5073dace..899ffb9333 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -93,6 +93,7 @@ public class KeyboardView extends View {
     private final float mVerticalCorrection;
     private final Drawable mKeyBackground;
     private final Drawable mFunctionalKeyBackground;
+    private final Drawable mEnterKeyBackground;
     private final Drawable mSpacebarBackground;
     private final float mSpacebarIconWidthRatio;
     private final Rect mKeyBackgroundPadding = new Rect();
@@ -139,6 +140,9 @@ public class KeyboardView extends View {
                 R.styleable.KeyboardView_functionalKeyBackground);
         mFunctionalKeyBackground = (functionalKeyBackground != null) ? functionalKeyBackground
                 : mKeyBackground;
+        final Drawable enterKeyBackground = keyboardViewAttr.getDrawable(
+                R.styleable.KeyboardView_enterKeyBackground);
+        mEnterKeyBackground = (enterKeyBackground!= null) ? enterKeyBackground : mFunctionalKeyBackground;
         final Drawable spacebarBackground = keyboardViewAttr.getDrawable(
                 R.styleable.KeyboardView_spacebarBackground);
         mSpacebarBackground = (spacebarBackground != null) ? spacebarBackground : mKeyBackground;
@@ -340,7 +344,7 @@ public class KeyboardView extends View {
 
         if (!key.isSpacer()) {
             final Drawable background = key.selectBackgroundDrawable(
-                    mKeyBackground, mFunctionalKeyBackground, mSpacebarBackground);
+                    mKeyBackground, mFunctionalKeyBackground, mEnterKeyBackground, mSpacebarBackground);
             if (background != null) {
                 onDrawKeyBackground(key, canvas, background);
             }
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 8ed3a59bf5..85882e47e4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2012,7 +2012,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             // For N and later, IMEs can specify Color.TRANSPARENT to make the navigation bar
             // transparent.  For other colors the system uses the default color.
             getWindow().getWindow().setNavigationBarColor(
-                    visible ? Color.BLACK : Color.TRANSPARENT);
+                    visible ? getColor(R.color.keyboard_navigation_bar) : Color.TRANSPARENT);
         }
     }
 }
-- 
GitLab


From 50f9a7ecc88ce868fed41ee4601d22e15d587a6c Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Fri, 2 Sep 2022 11:25:19 +0000
Subject: [PATCH 4/7] LatinIME: Fix navbar on light theme

---
 .../com/android/inputmethod/latin/LatinIME.java  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 85882e47e4..82914e076f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -16,6 +16,7 @@
 
 package com.android.inputmethod.latin;
 
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
 import static com.android.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
 import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
 import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
@@ -2008,11 +2009,24 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     private void setNavigationBarVisibility(final boolean visible) {
-        if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.M) {
+        if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.R) {
             // For N and later, IMEs can specify Color.TRANSPARENT to make the navigation bar
             // transparent.  For other colors the system uses the default color.
             getWindow().getWindow().setNavigationBarColor(
                     visible ? getColor(R.color.keyboard_navigation_bar) : Color.TRANSPARENT);
+
+            if (visible) {
+                final Configuration configuration = getResources().getConfiguration();
+                final boolean isNightMode = (configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
+                        == Configuration.UI_MODE_NIGHT_YES;
+                if (!isNightMode) {
+                    getWindow().getWindow().getInsetsController().setSystemBarsAppearance(
+                            APPEARANCE_LIGHT_NAVIGATION_BARS, APPEARANCE_LIGHT_NAVIGATION_BARS);
+                } else {
+                    getWindow().getWindow().getInsetsController().setSystemBarsAppearance(
+                            0, APPEARANCE_LIGHT_NAVIGATION_BARS);
+                }
+            }
         }
     }
 }
-- 
GitLab


From dec027de9212eb47108f519d01c79ad965a92878 Mon Sep 17 00:00:00 2001
From: TheScarastic <warabhishek@e.email>
Date: Fri, 2 Sep 2022 12:07:48 +0000
Subject: [PATCH 5/7] LatinIME: Reload theme on configuration change

---
 java/src/com/android/inputmethod/latin/LatinIME.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 82914e076f..85369e14cd 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -73,6 +73,7 @@ import com.android.inputmethod.event.InputTransaction;
 import com.android.inputmethod.keyboard.Keyboard;
 import com.android.inputmethod.keyboard.KeyboardActionListener;
 import com.android.inputmethod.keyboard.KeyboardId;
+import com.android.inputmethod.keyboard.KeyboardLayoutSet;
 import com.android.inputmethod.keyboard.KeyboardSwitcher;
 import com.android.inputmethod.keyboard.MainKeyboardView;
 import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
@@ -789,6 +790,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
                 cleanupInternalStateForFinishInput();
             }
         }
+        KeyboardLayoutSet.onKeyboardThemeChanged();
         super.onConfigurationChanged(conf);
     }
 
-- 
GitLab


From 15ceac25f987dce1bf8d193f77066a9d041c03a7 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 1 Nov 2022 11:54:17 +0530
Subject: [PATCH 6/7] Fix letters in dialpad

---
 java/res/values/themes-you.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/res/values/themes-you.xml b/java/res/values/themes-you.xml
index 49a03b9765..839462a59b 100644
--- a/java/res/values/themes-you.xml
+++ b/java/res/values/themes-you.xml
@@ -79,7 +79,7 @@
         <item name="keyTextInactivatedColor">@color/functional_text_color_you</item>
         <item name="functionalTextColor">@color/functional_text_color_you</item>
         <item name="keyHintLetterColor">@color/key_hint_letter_color_you</item>
-        <item name="keyHintLabelColor">@color/key_text_inactive_color_lxx_dark</item>
+        <item name="keyHintLabelColor">@color/key_hint_letter_color_you</item>
         <item name="keyShiftedLetterHintInactivatedColor">@color/key_text_inactive_color_lxx_dark</item>
         <item name="keyShiftedLetterHintActivatedColor">@color/key_text_color_lxx_dark</item>
         <item name="keyPreviewTextColor">@color/keyboard_key_text_color_you</item>
-- 
GitLab


From de8618a3d2208a326a03533ce4d49f53cb6ef90b Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 22 Mar 2023 18:05:43 +0530
Subject: [PATCH 7/7] Port translation changes from Android S

---
 java/res/values-de/strings.xml | 67 ++++++++++++++++------------------
 java/res/values-fr/strings.xml | 11 ++----
 java/res/values-it/strings.xml | 11 ++----
 java/res/values-nl/strings.xml | 59 ++++++++++++++----------------
 java/res/values-ru/strings.xml | 11 ++----
 5 files changed, 72 insertions(+), 87 deletions(-)

diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index af1edc8594..aa9ebc36d0 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
 /*
 **
@@ -16,10 +16,7 @@
 ** 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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="4262655277902459172">"Eingabeoptionen"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5006788115094214047">"Kontakte erkennen"</string>
     <string name="use_contacts_for_spellchecking_option_summary" msgid="3637428873952490597">"Rechtschreibprüfung kann Einträge aus meiner Kontaktliste verwenden"</string>
@@ -43,7 +40,7 @@
     <string name="clear_sync_data_confirmation" msgid="6815059501949766995">"Die synchronisierten Daten werden aus der Cloud gelöscht. Sicher?"</string>
     <string name="clear_sync_data_ok" msgid="1809712111627111859">"Löschen"</string>
     <string name="cloud_sync_cancel" msgid="3437544314029636750">"Abbrechen"</string>
-    <string name="cloud_sync_opt_in_text" msgid="5443081647469720267">"Dein persönliches Wörterbuch wird mit den Google-Servern synchronisiert und auf diesen Servern gesichert. Zur Verbesserung unserer Produkte werden eventuell statistische Daten zur Worthäufigkeit erfasst. Die Erfassung und Nutzung sämtlicher Daten erfolgt gemäß der "<a href="https://www.google.com/policies/privacy">"Datenschutzerklärung von Google"</a>"."</string>
+    <string name="cloud_sync_opt_in_text" msgid="5443081647469720267">Dein persönliches Wörterbuch wird mit den Google-Servern synchronisiert und auf diesen Servern gesichert. Zur Verbesserung unserer Produkte werden eventuell statistische Daten zur Worthäufigkeit erfasst. Die Erfassung und Nutzung sämtlicher Daten erfolgt gemäß der <a href="https://www.google.com/policies/privacy">Datenschutzerklärung von Google</a>. </string>
     <string name="add_account_to_enable_sync" msgid="1657487000451860348">"Zur Aktivierung dieser Funktion Google-Konto zu Gerät hinzufügen"</string>
     <string name="cloud_sync_summary_disabled_work_profile" msgid="4209488085168720952">"Synchronisierung für Geräte mit Apps für Business-Konten nicht verfügbar"</string>
     <string name="include_other_imes_in_language_switch_list" msgid="2523063290372613355">"Eingabemethoden wechseln"</string>
@@ -58,7 +55,7 @@
     <string name="use_contacts_dict" msgid="1625971825786907643">"Kontakte vorschlagen"</string>
     <string name="use_contacts_dict_summary" msgid="3820744038619192013">"Namen aus \"Kontakte\" als Vorschläge und Korrekturmöglichkeiten anzeigen"</string>
     <string name="use_personalized_dicts" msgid="7400413665774169711">"Personalisierte Vorschläge"</string>
-    <string name="enable_metrics_logging" msgid="5113593293708535701">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> verbessern"</string>
+    <string name="enable_metrics_logging" msgid="5113593293708535701"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> verbessern</string>
     <string name="use_double_space_period" msgid="7172135098923900609">"Punkt plus Leerzeichen"</string>
     <string name="use_double_space_period_summary" msgid="7812112507596640969">"Doppeltippen auf Leertaste fügt Punkt und Leerzeichen ein"</string>
     <string name="auto_cap" msgid="525628419128036324">"Autom. Groß-/Kleinschreibung"</string>
@@ -97,7 +94,7 @@
     <string name="keyboard_layout" msgid="1709024226955326813">"Tastaturdesign"</string>
     <string name="switch_accounts" msgid="1213242182459397913">"Konto wechseln"</string>
     <string name="no_accounts_selected" msgid="5770301395973322552">"Keine Konten ausgewählt"</string>
-    <string name="account_selected" msgid="2929764293361296224">"Momentan wird <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> verwendet."</string>
+    <string name="account_selected" msgid="2929764293361296224">Momentan wird <xliff:g id="EMAIL_ADDRESS" example="someone@example.com">%1$s</xliff:g> verwendet.</string>
     <string name="account_select_ok" msgid="2319402914890345072">"Ok"</string>
     <string name="account_select_cancel" msgid="8877103220502603643">"Abbrechen"</string>
     <string name="account_select_sign_out" msgid="9208156165797411519">"Abmelden"</string>
@@ -105,15 +102,15 @@
     <string name="subtype_en_GB" msgid="7923165641611861624">"Englisch (UK)"</string>
     <string name="subtype_en_US" msgid="5477258985573018813">"Englisch (USA)"</string>
     <string name="subtype_es_US" msgid="3224986579031001684">"Spanisch (USA)"</string>
-    <string name="subtype_hi_ZZ" msgid="5025145456877877595">"Hinglish"</string>
+    <string name="subtype_hi_ZZ" msgid="5025145456877877595">Hinglish</string>
     <string name="subtype_sr_ZZ" msgid="440245129648071485">"Serbisch (Lateinisch)"</string>
-    <string name="subtype_with_layout_en_GB" msgid="4220344684463778660">"Englisch (GB) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_en_US" msgid="4599421650961912769">"Englisch (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_es_US" msgid="6866331205974243592">"Spanisch (USA) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_hi_ZZ" msgid="5439623653083985558">"Hinglish (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_sr_ZZ" msgid="546465971819327060">"Serbisch (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_generic_traditional" msgid="5321023815277210849">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditionell)"</string>
-    <string name="subtype_generic_compact" msgid="2858514299576793292">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kompakt)"</string>
+    <string name="subtype_with_layout_en_GB" msgid="4220344684463778660">Englisch (GB) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_en_US" msgid="4599421650961912769">Englisch (USA) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_es_US" msgid="6866331205974243592">Spanisch (USA) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_hi_ZZ" msgid="5439623653083985558">Hinglish (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_sr_ZZ" msgid="546465971819327060">Serbisch (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_generic_traditional" msgid="5321023815277210849"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (traditionell)</string>
+    <string name="subtype_generic_compact" msgid="2858514299576793292"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (kompakt)</string>
     <string name="subtype_no_language" msgid="3126489367892967889">"Keine Sprache (lat. Alphabet)"</string>
     <string name="subtype_no_language_qwerty" msgid="4388578258275303241">"Lat. Alphabet (QWERTY)"</string>
     <string name="subtype_no_language_qwertz" msgid="1483779599796051141">"Lat. Alphabet (QWERTZ)"</string>
@@ -133,27 +130,27 @@
     <string name="custom_input_style_note_message" msgid="7172574301336711360">"Dein benutzerdefinierter Eingabestil muss vor der Verwendung aktiviert werden. Möchtest du ihn jetzt aktivieren?"</string>
     <string name="enable" msgid="3465950915897490353">"Aktivieren"</string>
     <string name="not_now" msgid="6385104011963838405">"Später"</string>
-    <string name="custom_input_style_already_exists" msgid="691995042134481799">"Der gleiche Eingabestil ist bereits vorhanden: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+    <string name="custom_input_style_already_exists" msgid="691995042134481799">Der gleiche Eingabestil ist bereits vorhanden: <xliff:g id="INPUT_STYLE_NAME" example="English (Dvorak)">%s</xliff:g></string>
     <string name="prefs_keypress_vibration_duration_settings" msgid="1191846765985854173">"Vibrationsdauer bei Tastendruck"</string>
     <string name="prefs_keypress_sound_volume_settings" msgid="871310008809673416">"Tonlautstärke bei Tastendruck"</string>
     <string name="prefs_key_longpress_timeout_settings" msgid="5901254294943018798">"Dauer für langen Tastendruck"</string>
     <string name="prefs_enable_emoji_alt_physical_key" msgid="2935264131313540056">"Emoji für physische Tastatur"</string>
     <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="1002326516601127090">"Emoji-Palette auf physischen Tastaturen über Alt-Taste aufrufen"</string>
     <string name="button_default" msgid="4824983794085575316">"Standard"</string>
-    <string name="setup_welcome_title" msgid="6678758294706106216">"Willkommen bei <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_welcome_title" msgid="6678758294706106216">Willkommen bei <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g></string>
     <string name="setup_welcome_additional_description" msgid="5109278388931620095">"mit Gesteneingabe"</string>
     <string name="setup_start_action" msgid="4261815646635054773">"Jetzt starten"</string>
     <string name="setup_next_action" msgid="7388109452671117767">"Nächster Schritt"</string>
-    <string name="setup_steps_title" msgid="750835620571733090">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> einrichten"</string>
-    <string name="setup_step1_title" msgid="7160930459489282227">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> aktivieren"</string>
-    <string name="setup_step1_instruction" msgid="7576103876848322594">"Aktiviere \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" unter \"Sprache &amp; Eingabe\". Damit wird die App auf deinem Gerät autorisiert."</string>
-    <string name="setup_step1_finished_instruction" msgid="9170737556500224736">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> ist bereits in deinen Einstellungen für \"Sprache &amp; Eingabe\" aktiviert. Fahre mit dem nächsten Schritt fort."</string>
+    <string name="setup_steps_title" msgid="750835620571733090"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> einrichten</string>
+    <string name="setup_step1_title" msgid="7160930459489282227"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> aktivieren</string>
+    <string name="setup_step1_instruction" msgid="7576103876848322594">Aktiviere „<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>“ unter „Sprache &amp; Eingabe“. Damit wird die App auf deinem Gerät autorisiert.</string>
+    <string name="setup_step1_finished_instruction" msgid="9170737556500224736"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> ist bereits in deinen Einstellungen für „Sprache &amp; Eingabe“ aktiviert. Fahre mit dem nächsten Schritt fort.</string>
     <string name="setup_step1_action" msgid="6741430464134100280">"In den Einstellungen aktivieren"</string>
-    <string name="setup_step2_title" msgid="6087917340371885886">"Zu <xliff:g id="APPLICATION_NAME">%s</xliff:g> wechseln"</string>
-    <string name="setup_step2_instruction" msgid="1656822854161841686">"Wähle dann \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" als deine aktive Texteingabemethode."</string>
+    <string name="setup_step2_title" msgid="6087917340371885886">Zu <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> wechseln</string>
+    <string name="setup_step2_instruction" msgid="1656822854161841686">Wähle dann „<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>“ als deine aktive Texteingabemethode.</string>
     <string name="setup_step2_action" msgid="7850810726169586795">"Eingabemethode wechseln"</string>
-    <string name="setup_step3_title" msgid="8037349177063816231">"Die Einrichtung ist abgeschlossen"</string>
-    <string name="setup_step3_instruction" msgid="6738330437227290519">"Jetzt kannst du in allen deinen Lieblings-Apps über <xliff:g id="APPLICATION_NAME">%s</xliff:g> Text eingeben."</string>
+    <string name="setup_step3_title" msgid="8037349177063816231">Die Einrichtung ist abgeschlossen!</string>
+    <string name="setup_step3_instruction" msgid="6738330437227290519">Jetzt kannst du in allen deinen Lieblings-Apps mit <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> Text eingeben.</string>
     <string name="setup_step3_action" msgid="1049832326490515701">"Weitere Sprachen konfigurieren"</string>
     <string name="setup_finish_action" msgid="4208185697271120108">"Fertig"</string>
     <string name="show_setup_wizard_icon" msgid="2985876024078390815">"App-Symbol anzeigen"</string>
@@ -168,14 +165,14 @@
     <string name="user_dictionaries" msgid="4261154182736972314">"Meine Wörterbücher"</string>
     <string name="default_user_dict_pref_name" msgid="6983281585422145165">"Mein Wörterbuch"</string>
     <string name="dictionary_available" msgid="1808541860747006757">"Wörterbuch verfügbar"</string>
-    <string name="dictionary_downloading" msgid="196314208594985478">"Wird heruntergeladen..."</string>
+    <string name="dictionary_downloading" msgid="196314208594985478">Wird heruntergeladen …</string>
     <string name="dictionary_installed" msgid="7840532191933912708">"Installiert"</string>
     <string name="dictionary_disabled" msgid="3991458948275777795">"Installiert, deaktiviert"</string>
     <string name="cannot_connect_to_dict_service" msgid="2343267566673179104">"Kein Wörterbuchdienst"</string>
     <string name="no_dictionaries_available" msgid="4187305901152592110">"Keine Wörterbücher"</string>
     <string name="check_for_updates_now" msgid="5375846376242975290">"Aktualisieren"</string>
     <string name="last_update" msgid="2377094521844654156">"Zuletzt aktualisiert"</string>
-    <string name="message_updating" msgid="7158989361989504143">"Suche nach Updates..."</string>
+    <string name="message_updating" msgid="7158989361989504143">Suche nach Aktualisierungen …</string>
     <string name="message_loading" msgid="9151934303930222809">"Wird geladen…"</string>
     <string name="main_dict_description" msgid="695289288722079926">"Allgemeines Wörterbuch"</string>
     <string name="cancel" msgid="5611033781118852820">"Abbrechen"</string>
@@ -183,13 +180,13 @@
     <string name="install_dict" msgid="8963966683066463555">"Installieren"</string>
     <string name="cancel_download_dict" msgid="8877923127773611502">"Abbrechen"</string>
     <string name="delete_dict" msgid="293286833341025636">"Löschen"</string>
-    <string name="should_download_over_metered_prompt" msgid="2055970799464394373">"Für die auf deinem Mobilgerät ausgewählte Sprache ist ein Wörterbuch verfügbar.&lt;br/&gt; &lt;b&gt;Lade das <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>-Wörterbuch herunter,&lt;/b&gt; und verbessere deine Eingabeerfahrung.&lt;br/&gt; &lt;br/&gt; Der Download über 3G kann ein bis zwei Minuten dauern. Falls du keine &lt;b&gt;Datenflatrate&lt;/b&gt; hast, fallen eventuell Gebühren an.&lt;br/&gt; Solltest du dir nicht sicher sein, welchen Datentarif du hast, suche eine WLAN-Verbindung, um den Download automatisch zu starten.&lt;br/&gt; &lt;br/&gt; Tipp: Du kannst Wörterbücher herunterladen und entfernen. Gehe dazu auf deinem Gerät im Menü <b>Einstellungen</b> zu &lt;b&gt;Sprache &amp; Eingabe&lt;/b&gt;."</string>
-    <string name="download_over_metered" msgid="4261625913263960556">"Jetzt herunterladen (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
+    <string name="should_download_over_metered_prompt" msgid="2055970799464394373">Für die auf deinem Mobilgerät ausgewählte Sprache ist ein Wörterbuch verfügbar.&lt;br/&gt; &lt;b&gt;Lade das <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g>-Wörterbuch herunter,&lt;/b&gt; und verbessere deine Eingabeerfahrung.&lt;br/&gt; &lt;br/&gt; Der Download über 3G kann ein bis zwei Minuten dauern. Falls du keine &lt;b&gt;Datenflatrate&lt;/b&gt; hast, fallen eventuell Gebühren an.&lt;br/&gt; Solltest du dir nicht sicher sein, welchen Datentarif du hast, suche eine WLAN-Verbindung, um den Download automatisch zu starten.&lt;br/&gt; &lt;br/&gt; Tipp: Du kannst Wörterbücher herunterladen und entfernen. Gehe dazu auf deinem Gerät im Menü zu &lt;b&gt;Sprache &amp; Eingabe&lt;/b&gt;.</string>
+    <string name="download_over_metered" msgid="4261625913263960556">Jetzt herunterladen (<xliff:g id="SIZE_IN_MEGABYTES" example="0.7">%1$.1f</xliff:g> MB)</string>
     <string name="do_not_download_over_metered" msgid="3581560726170361477">"Über WLAN herunterladen"</string>
-    <string name="dict_available_notification_title" msgid="4601321236641174590">"Es ist ein Wörterbuch für <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> verfügbar."</string>
+    <string name="dict_available_notification_title" msgid="4601321236641174590">Es ist ein Wörterbuch für <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g> verfügbar.</string>
     <string name="dict_available_notification_description" msgid="5360056805680595057">"Zum Lesen und Herunterladen drücken"</string>
-    <string name="toast_downloading_suggestions" msgid="8611681981781082223">"Download wurde gestartet: Vorschläge für <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> sind in Kürze bereit."</string>
-    <string name="version_text" msgid="3213200439763585436">"Version <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
+    <string name="toast_downloading_suggestions" msgid="8611681981781082223">Das Herunterladen wurde gestartet: Vorschläge für <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g> sind in Kürze bereit.</string>
+    <string name="version_text" msgid="3213200439763585436">Version <xliff:g id="VERSION_NUMBER" example="1.0.1864.643521">%1$s</xliff:g></string>
     <string name="user_dict_settings_add_menu_title" msgid="2094235623352820667">"Hinzufügen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="2721075588858235712">"Zum Wörterbuch hinzufügen"</string>
     <string name="user_dict_settings_add_screen_title" msgid="3777988967870363317">"Wortgruppe"</string>
@@ -206,7 +203,7 @@
     <string name="user_dict_settings_context_menu_delete_title" msgid="2615595304309771624">"Löschen"</string>
     <string name="user_dict_settings_empty_text" msgid="2730443669360549945">"Es sind noch keine Wörter in deinem Wörterbuch vorhanden. Du kannst Wörter hinzufügen, indem du auf das \"+\"-Symbol tippst."</string>
     <string name="user_dict_settings_all_languages" msgid="4423377540643689186">"Für alle Sprachen"</string>
-    <string name="user_dict_settings_more_languages" msgid="4436784162689712198">"Weitere Sprachen..."</string>
+    <string name="user_dict_settings_more_languages" msgid="4436784162689712198">Weitere Sprachen …</string>
     <string name="user_dict_settings_delete" msgid="7688033506773806537">"Löschen"</string>
     <string name="user_dict_fast_scroll_alphabet" msgid="6814045626833403178">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 0a30a74198..8b7229e713 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
 /*
 **
@@ -16,10 +16,7 @@
 ** 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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="4262655277902459172">"Options de saisie"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5006788115094214047">"Rechercher les noms de contacts"</string>
     <string name="use_contacts_for_spellchecking_option_summary" msgid="3637428873952490597">"Le correcteur orthographique utilise les noms des contacts."</string>
@@ -129,7 +126,7 @@
     <string name="remove" msgid="4473717811376496460">"Supprimer"</string>
     <string name="save" msgid="1396012053841537145">"Enregistrer"</string>
     <string name="subtype_locale" msgid="705244739623031884">"Langue"</string>
-    <string name="keyboard_layout_set" msgid="1637617996906076019">"Clavier"</string>
+    <string name="keyboard_layout_set" msgid="1637617996906076019">Disposition</string>
     <string name="custom_input_style_note_message" msgid="7172574301336711360">"Vous devez activer votre style de saisie personnalisé avant de l\'utiliser. Voulez-vous le faire maintenant ?"</string>
     <string name="enable" msgid="3465950915897490353">"Activer"</string>
     <string name="not_now" msgid="6385104011963838405">"Pas maintenant"</string>
@@ -209,4 +206,4 @@
     <string name="user_dict_settings_more_languages" msgid="4436784162689712198">"Plus de langues…"</string>
     <string name="user_dict_settings_delete" msgid="7688033506773806537">"Supprimer"</string>
     <string name="user_dict_fast_scroll_alphabet" msgid="6814045626833403178">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index ee471860d5..1c69deb271 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
 /*
 **
@@ -16,10 +16,7 @@
 ** 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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="4262655277902459172">"Opzioni inserimento"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5006788115094214047">"Cerca in nomi contatti"</string>
     <string name="use_contacts_for_spellchecking_option_summary" msgid="3637428873952490597">"La funzione di controllo ortografico usa voci dell\'elenco contatti"</string>
@@ -178,7 +175,7 @@
     <string name="message_updating" msgid="7158989361989504143">"Verifica disponibilità aggiornamenti"</string>
     <string name="message_loading" msgid="9151934303930222809">"Caricamento..."</string>
     <string name="main_dict_description" msgid="695289288722079926">"Dizionario principale"</string>
-    <string name="cancel" msgid="5611033781118852820">"Annulla"</string>
+    <string name="cancel" msgid="5611033781118852820">Annulla</string>
     <string name="go_to_settings" msgid="3019191145506686424">"Impostazioni"</string>
     <string name="install_dict" msgid="8963966683066463555">"Installa"</string>
     <string name="cancel_download_dict" msgid="8877923127773611502">"Annulla"</string>
@@ -209,4 +206,4 @@
     <string name="user_dict_settings_more_languages" msgid="4436784162689712198">"Altre lingue..."</string>
     <string name="user_dict_settings_delete" msgid="7688033506773806537">"Elimina"</string>
     <string name="user_dict_fast_scroll_alphabet" msgid="6814045626833403178">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index afef942d8e..98750c42f0 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
 /*
 **
@@ -16,10 +16,7 @@
 ** 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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="4262655277902459172">"Invoeropties"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5006788115094214047">"Contactnamen opzoeken"</string>
     <string name="use_contacts_for_spellchecking_option_summary" msgid="3637428873952490597">"De spellingcontrole gebruikt items uit je contactenlijst"</string>
@@ -43,7 +40,7 @@
     <string name="clear_sync_data_confirmation" msgid="6815059501949766995">"Wil je gesynchroniseerde gegevens echt verwijderen uit de cloud?"</string>
     <string name="clear_sync_data_ok" msgid="1809712111627111859">"Verwijderen"</string>
     <string name="cloud_sync_cancel" msgid="3437544314029636750">"Annuleren"</string>
-    <string name="cloud_sync_opt_in_text" msgid="5443081647469720267">"Je persoonlijke woordenboek wordt gesynchroniseerd en er wordt een back-up gemaakt op servers van Google. De statistische gegevens voor woordfrequentie kunnen worden verzameld om onze producten te verbeteren. Het verzamelen en gebruik van alle gegevens is in overeenstemming met het "<a href="https://www.google.com/policies/privacy">"Privacybeleid van Google"</a>"."</string>
+    <string name="cloud_sync_opt_in_text" msgid="5443081647469720267">Je persoonlijke woordenboek wordt gesynchroniseerd en er wordt een back-up gemaakt op servers van Google. De statistische gegevens voor woordfrequentie kunnen worden verzameld om onze producten te verbeteren. Het verzamelen en gebruik van alle gegevens is in overeenstemming met het <a href="https://www.google.com/policies/privacy">Privacybeleid van Google</a>. </string>
     <string name="add_account_to_enable_sync" msgid="1657487000451860348">"Voeg een Google-account toe om deze functie in te schakelen"</string>
     <string name="cloud_sync_summary_disabled_work_profile" msgid="4209488085168720952">"Synchronisatie is niet beschikbaar voor Google Apps for Business-accounts"</string>
     <string name="include_other_imes_in_language_switch_list" msgid="2523063290372613355">"Invoermeth. overschakelen"</string>
@@ -58,7 +55,7 @@
     <string name="use_contacts_dict" msgid="1625971825786907643">"Contactnamen suggereren"</string>
     <string name="use_contacts_dict_summary" msgid="3820744038619192013">"Namen uit Contacten gebruiken voor suggesties en correcties"</string>
     <string name="use_personalized_dicts" msgid="7400413665774169711">"Gepersonaliseerde suggesties"</string>
-    <string name="enable_metrics_logging" msgid="5113593293708535701">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> verbeteren"</string>
+    <string name="enable_metrics_logging" msgid="5113593293708535701"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> verbeteren</string>
     <string name="use_double_space_period" msgid="7172135098923900609">"Dubbeltik is punt, spatie"</string>
     <string name="use_double_space_period_summary" msgid="7812112507596640969">"Dubbeltik op spatiebalk voor een punt gevolgd door een spatie"</string>
     <string name="auto_cap" msgid="525628419128036324">"Auto-hoofdlettergebruik"</string>
@@ -97,7 +94,7 @@
     <string name="keyboard_layout" msgid="1709024226955326813">"Toetsenbordthema"</string>
     <string name="switch_accounts" msgid="1213242182459397913">"Schakelen tussen accounts"</string>
     <string name="no_accounts_selected" msgid="5770301395973322552">"Geen accounts geselecteerd"</string>
-    <string name="account_selected" msgid="2929764293361296224">"<xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> wordt momenteel gebruikt"</string>
+    <string name="account_selected" msgid="2929764293361296224">Momenteel wordt <xliff:g id="EMAIL_ADDRESS" example="someone@example.com">%1$s</xliff:g> gebruikt</string>
     <string name="account_select_ok" msgid="2319402914890345072">"OK"</string>
     <string name="account_select_cancel" msgid="8877103220502603643">"Annuleren"</string>
     <string name="account_select_sign_out" msgid="9208156165797411519">"Uitloggen"</string>
@@ -107,13 +104,13 @@
     <string name="subtype_es_US" msgid="3224986579031001684">"Spaans (VS)"</string>
     <string name="subtype_hi_ZZ" msgid="5025145456877877595">"Hindi-Engels"</string>
     <string name="subtype_sr_ZZ" msgid="440245129648071485">"Servisch (Latijns)"</string>
-    <string name="subtype_with_layout_en_GB" msgid="4220344684463778660">"Engels (VK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_en_US" msgid="4599421650961912769">"Engels (VS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_es_US" msgid="6866331205974243592">"Spaans (VS) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_hi_ZZ" msgid="5439623653083985558">"Hindi-Engels (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_with_layout_sr_ZZ" msgid="546465971819327060">"Servisch (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
-    <string name="subtype_generic_traditional" msgid="5321023815277210849">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (traditioneel)"</string>
-    <string name="subtype_generic_compact" msgid="2858514299576793292">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (compact)"</string>
+    <string name="subtype_with_layout_en_GB" msgid="4220344684463778660">Engels (VK) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_en_US" msgid="4599421650961912769">Engels (VS) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_es_US" msgid="6866331205974243592">Spaans (VS) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_hi_ZZ" msgid="5439623653083985558">Hindi-Engels (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_with_layout_sr_ZZ" msgid="546465971819327060">Servisch (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>
+    <string name="subtype_generic_traditional" msgid="5321023815277210849"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (traditioneel)</string>
+    <string name="subtype_generic_compact" msgid="2858514299576793292"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (compact)</string>
     <string name="subtype_no_language" msgid="3126489367892967889">"Geen taal (alfabet)"</string>
     <string name="subtype_no_language_qwerty" msgid="4388578258275303241">"Alfabet (QWERTY)"</string>
     <string name="subtype_no_language_qwertz" msgid="1483779599796051141">"Alfabet (QWERTZ)"</string>
@@ -133,27 +130,27 @@
     <string name="custom_input_style_note_message" msgid="7172574301336711360">"Je moet je aangepaste invoerstijl inschakelen voor je deze kunt gebruiken. Wil je de invoerstijl nu inschakelen?"</string>
     <string name="enable" msgid="3465950915897490353">"Inschakelen"</string>
     <string name="not_now" msgid="6385104011963838405">"Niet nu"</string>
-    <string name="custom_input_style_already_exists" msgid="691995042134481799">"Dezelfde invoerstijl bestaat al: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+    <string name="custom_input_style_already_exists" msgid="691995042134481799">Dezelfde invoerstijl bestaat al: <xliff:g id="INPUT_STYLE_NAME" example="English (Dvorak)">%s</xliff:g></string>
     <string name="prefs_keypress_vibration_duration_settings" msgid="1191846765985854173">"Trilingsduur bij toetsgebruik"</string>
     <string name="prefs_keypress_sound_volume_settings" msgid="871310008809673416">"Geluidsvolume bij toetsgebruik"</string>
     <string name="prefs_key_longpress_timeout_settings" msgid="5901254294943018798">"Lengte toetsinvoer"</string>
     <string name="prefs_enable_emoji_alt_physical_key" msgid="2935264131313540056">"Emoji voor fysiek toetsenbord"</string>
     <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="1002326516601127090">"Emoji-palet weergeven met fysieke Alt-toets"</string>
     <string name="button_default" msgid="4824983794085575316">"Standaard"</string>
-    <string name="setup_welcome_title" msgid="6678758294706106216">"Welkom bij <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_welcome_title" msgid="6678758294706106216">Welkom bij <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g></string>
     <string name="setup_welcome_additional_description" msgid="5109278388931620095">"met Invoer met bewegingen"</string>
     <string name="setup_start_action" msgid="4261815646635054773">"Aan de slag"</string>
     <string name="setup_next_action" msgid="7388109452671117767">"Volgende stap"</string>
-    <string name="setup_steps_title" msgid="750835620571733090">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> instellen"</string>
-    <string name="setup_step1_title" msgid="7160930459489282227">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> inschakelen"</string>
-    <string name="setup_step1_instruction" msgid="7576103876848322594">"Vink \'<xliff:g id="APPLICATION_NAME">%s</xliff:g>\' aan in de instellingen bij \'Talen en invoer\'. De app kan dan worden uitgevoerd op je apparaat."</string>
-    <string name="setup_step1_finished_instruction" msgid="9170737556500224736">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> is al ingeschakeld in de instellingen bij \'Talen en invoer\', dus deze stap is voltooid. Op naar de volgende!"</string>
+    <string name="setup_steps_title" msgid="750835620571733090"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> instellen</string>
+    <string name="setup_step1_title" msgid="7160930459489282227"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> inschakelen</string>
+    <string name="setup_step1_instruction" msgid="7576103876848322594">Vink \'<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>\' aan in de instellingen bij \'Talen en invoer\'. De app kan dan worden uitgevoerd op je apparaat.</string>
+    <string name="setup_step1_finished_instruction" msgid="9170737556500224736"><xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g> is al ingeschakeld in de instellingen bij \'Talen en invoer\', dus deze stap is voltooid. Op naar de volgende!</string>
     <string name="setup_step1_action" msgid="6741430464134100280">"Inschakelen in \'Instellingen\'"</string>
-    <string name="setup_step2_title" msgid="6087917340371885886">"Overschakelen naar <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="setup_step2_instruction" msgid="1656822854161841686">"Selecteer vervolgens \'<xliff:g id="APPLICATION_NAME">%s</xliff:g>\' als actieve tekstinvoermethode."</string>
+    <string name="setup_step2_title" msgid="6087917340371885886">Overschakelen naar <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g></string>
+    <string name="setup_step2_instruction" msgid="1656822854161841686">Selecteer vervolgens \'<xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>\' als actieve tekstinvoermethode.</string>
     <string name="setup_step2_action" msgid="7850810726169586795">"Schakelen tussen invoermethoden"</string>
-    <string name="setup_step3_title" msgid="8037349177063816231">"Gefeliciteerd, je kunt nu aan de slag."</string>
-    <string name="setup_step3_instruction" msgid="6738330437227290519">"Je kunt nu in al je favoriete apps typen met <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
+    <string name="setup_step3_title" msgid="8037349177063816231">Gefeliciteerd, je kunt nu aan de slag!</string>
+    <string name="setup_step3_instruction" msgid="6738330437227290519">Je kunt nu in al je favoriete apps typen met <xliff:g id="APPLICATION_NAME" example="Android Keyboard">%s</xliff:g>.</string>
     <string name="setup_step3_action" msgid="1049832326490515701">"Extra talen configureren"</string>
     <string name="setup_finish_action" msgid="4208185697271120108">"Voltooid"</string>
     <string name="show_setup_wizard_icon" msgid="2985876024078390815">"App-pictogram weergeven"</string>
@@ -183,13 +180,13 @@
     <string name="install_dict" msgid="8963966683066463555">"Installeren"</string>
     <string name="cancel_download_dict" msgid="8877923127773611502">"Annuleren"</string>
     <string name="delete_dict" msgid="293286833341025636">"Verwijderen"</string>
-    <string name="should_download_over_metered_prompt" msgid="2055970799464394373">"Er is een woordenboek voor de geselecteerde taal beschikbaar op je mobiele apparaat.&lt;br/&gt; We raden je aan het woordenboek voor <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> te &lt;b&gt;downloaden&lt;/b&gt; om je typvaardigheid te verbeteren.&lt;br/&gt; &lt;br/&gt; De download kan één of twee minuten duren via 3G. Er kunnen kosten worden berekend als je geen &lt;b&gt;onbeperkt gegevensabonnement&lt;/b&gt; hebt.&lt;br/&gt; Als je niet zeker weet welk gegevensabonnement je hebt, raden we je aan een wifi-verbinding te zoeken om de download automatisch te starten.&lt;br/&gt; &lt;br/&gt; Tip: je kunt woordenboeken downloaden en verwijderen via &lt;b&gt;Talen en invoer&lt;/b&gt; in het menu &lt;b&gt;Instellingen&lt;/b&gt; van je mobiele apparaat."</string>
-    <string name="download_over_metered" msgid="4261625913263960556">"Nu downloaden (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
+    <string name="should_download_over_metered_prompt" msgid="2055970799464394373">Er is een woordenboek voor de geselecteerde taal beschikbaar op je mobiele apparaat.&lt;br/&gt; We raden je aan het woordenboek voor <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g> te &lt;b&gt;downloaden&lt;/b&gt; om het typen eenvoudiger te maken.&lt;br/&gt; &lt;br/&gt; De download kan één of twee minuten duren via 3G. Er kunnen kosten worden berekend als je geen &lt;b&gt;onbeperkt gegevensabonnement&lt;/b&gt; hebt.&lt;br/&gt; Als je niet zeker weet welk gegevensabonnement je hebt, raden we je aan een wifi-verbinding te zoeken om de download automatisch te starten.&lt;br/&gt; &lt;br/&gt; Tip: je kunt woordenboeken downloaden en verwijderen via &lt;b&gt;Talen en invoer&lt;/b&gt; in het menu &lt;b&gt;Instellingen&lt;/b&gt; van je mobiele apparaat.</string>
+    <string name="download_over_metered" msgid="4261625913263960556">Nu downloaden (<xliff:g id="SIZE_IN_MEGABYTES" example="0.7">%1$.1f</xliff:g> MB)</string>
     <string name="do_not_download_over_metered" msgid="3581560726170361477">"Downloaden via wifi"</string>
-    <string name="dict_available_notification_title" msgid="4601321236641174590">"Er is een woordenboek beschikbaar voor het <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
+    <string name="dict_available_notification_title" msgid="4601321236641174590">Er is een woordenboek beschikbaar voor <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g></string>
     <string name="dict_available_notification_description" msgid="5360056805680595057">"Druk om te controleren en te downloaden"</string>
-    <string name="toast_downloading_suggestions" msgid="8611681981781082223">"Downloaden: suggesties voor het <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> zijn binnenkort beschikbaar."</string>
-    <string name="version_text" msgid="3213200439763585436">"Versie <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
+    <string name="toast_downloading_suggestions" msgid="8611681981781082223">Downloaden: suggesties voor het <xliff:g id="LANGUAGE_NAME" example="English">%1$s</xliff:g> zijn binnenkort beschikbaar.</string>
+    <string name="version_text" msgid="3213200439763585436">Versie <xliff:g id="VERSION_NUMBER" example="1.0.1864.643521">%1$s</xliff:g></string>
     <string name="user_dict_settings_add_menu_title" msgid="2094235623352820667">"Toevoegen"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="2721075588858235712">"Toevoegen aan woordenboek"</string>
     <string name="user_dict_settings_add_screen_title" msgid="3777988967870363317">"Zinsdeel"</string>
@@ -209,4 +206,4 @@
     <string name="user_dict_settings_more_languages" msgid="4436784162689712198">"Meer talen…"</string>
     <string name="user_dict_settings_delete" msgid="7688033506773806537">"Verwijderen"</string>
     <string name="user_dict_fast_scroll_alphabet" msgid="6814045626833403178">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 07440e1da7..bfe0b6825f 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
 /*
 **
@@ -16,10 +16,7 @@
 ** 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">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_input_options" msgid="4262655277902459172">"Настройки"</string>
     <string name="use_contacts_for_spellchecking_option_title" msgid="5006788115094214047">"Поиск в контактах"</string>
     <string name="use_contacts_for_spellchecking_option_summary" msgid="3637428873952490597">"Использовать имена контактов при проверке правописания"</string>
@@ -178,7 +175,7 @@
     <string name="message_updating" msgid="7158989361989504143">"Проверка обновлений…"</string>
     <string name="message_loading" msgid="9151934303930222809">"Загрузка…"</string>
     <string name="main_dict_description" msgid="695289288722079926">"Основной словарь"</string>
-    <string name="cancel" msgid="5611033781118852820">"Отмена"</string>
+    <string name="cancel" msgid="5611033781118852820">Отмена</string>
     <string name="go_to_settings" msgid="3019191145506686424">"Настройки"</string>
     <string name="install_dict" msgid="8963966683066463555">"Установить"</string>
     <string name="cancel_download_dict" msgid="8877923127773611502">"Отмена"</string>
@@ -209,4 +206,4 @@
     <string name="user_dict_settings_more_languages" msgid="4436784162689712198">"Другой язык"</string>
     <string name="user_dict_settings_delete" msgid="7688033506773806537">"Удалить"</string>
     <string name="user_dict_fast_scroll_alphabet" msgid="6814045626833403178">" АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"</string>
-</resources>
+</resources>
\ No newline at end of file
-- 
GitLab