From c92b663e5b14e049f5dd32e27ce3a34f2df8f924 Mon Sep 17 00:00:00 2001 From: BlackyHawky Date: Sun, 13 Aug 2023 22:43:29 +0200 Subject: [PATCH] Update symbols "apostrophe" key: "?" is now always selected. (#77) --- .../keyboard/internal/KeyboardTextsTable.java | 22 +++++++++---------- .../main/res/xml/rowkeys_azerty3_right3.xml | 2 +- .../values/donottranslate-more-keys.xml | 1 - 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java index 4e5ac9e2e..671132260 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java @@ -253,16 +253,15 @@ public final class KeyboardTextsTable { /* 169: 0 */ "double_9qm_lqm", /* 170: 0 */ "double_9qm_rqm", /* 171: 0 */ "double_rqm_9qm", - /* 172: 0 */ "morekeys_apostrophe", - /* 173: 0 */ "morekeys_single_quote", - /* 174: 0 */ "morekeys_double_quote", - /* 175: 0 */ "morekeys_tablet_double_quote", - /* 176: 0 */ "keyspec_emoji_action_key", - /* 177: 0 */ "keyspec_emoji_normal_key", - /* 178: 0 */ "keyspec_clipboard_action_key", - /* 179: 0 */ "keyspec_clipboard_normal_key", - /* 180: 0 */ "keyspec_start_onehanded_mode", - /* 181: 0 */ "keyspec_language_switch", + /* 172: 0 */ "morekeys_single_quote", + /* 173: 0 */ "morekeys_double_quote", + /* 174: 0 */ "morekeys_tablet_double_quote", + /* 175: 0 */ "keyspec_emoji_action_key", + /* 176: 0 */ "keyspec_emoji_normal_key", + /* 177: 0 */ "keyspec_clipboard_action_key", + /* 178: 0 */ "keyspec_clipboard_normal_key", + /* 179: 0 */ "keyspec_start_onehanded_mode", + /* 180: 0 */ "keyspec_language_switch", }; private static final String EMPTY = ""; @@ -483,7 +482,6 @@ public final class KeyboardTextsTable { /* double_9qm_lqm */ "\u201D,\u201E,\u201C", /* double_9qm_rqm */ "\u201C,\u201E,\u201D", /* double_rqm_9qm */ "\u201C,\u201D,\u201E", - /* morekeys_apostrophe */ "!fixedColumnOrder!3,\u201A,?,\u2018,\u2019,!text/keyspec_left_single_angle_quote,!text/keyspec_right_single_angle_quote", /* morekeys_single_quote */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes", /* morekeys_double_quote */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes", /* morekeys_tablet_double_quote */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes", @@ -4265,7 +4263,7 @@ public final class KeyboardTextsTable { private static final Object[] LOCALES_AND_TEXTS = { // "locale", TEXT_ARRAY, /* numberOfNonNullText/lengthOf_TEXT_ARRAY localeName */ - "DEFAULT", TEXTS_DEFAULT, /* 182/182 DEFAULT */ + "DEFAULT", TEXTS_DEFAULT, /* 181/181 DEFAULT */ "af" , TEXTS_af, /* 7/ 13 Afrikaans */ "ar" , TEXTS_ar, /* 55/110 Arabic */ "az" , TEXTS_az, /* 11/ 18 Azerbaijani */ diff --git a/app/src/main/res/xml/rowkeys_azerty3_right3.xml b/app/src/main/res/xml/rowkeys_azerty3_right3.xml index 88a7aee9c..73cb3909e 100644 --- a/app/src/main/res/xml/rowkeys_azerty3_right3.xml +++ b/app/src/main/res/xml/rowkeys_azerty3_right3.xml @@ -41,7 +41,7 @@ + latin:additionalMoreKeys="\?,!text/single_quotes,!text/single_angle_quotes" /> diff --git a/tools/make-keyboard-text/src/main/resources/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/src/main/resources/values/donottranslate-more-keys.xml index f96923f73..d26383e20 100644 --- a/tools/make-keyboard-text/src/main/resources/values/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/src/main/resources/values/donottranslate-more-keys.xml @@ -255,7 +255,6 @@ ”,„,“ “,„,” “,”,„ - !fixedColumnOrder!3,‚,?,‘,’,!text/keyspec_left_single_angle_quote,!text/keyspec_right_single_angle_quote !fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes !fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes !fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes