aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/input_basic.xml2
-rw-r--r--java/res/layout/input_basic_highcontrast.xml2
-rw-r--r--java/res/layout/input_gingerbread.xml2
-rw-r--r--java/res/layout/input_honeycomb.xml2
-rw-r--r--java/res/layout/input_stone_bold.xml2
-rw-r--r--java/res/layout/input_stone_normal.xml2
-rw-r--r--java/res/layout/keyboard_popup.xml4
-rw-r--r--java/res/layout/keyboard_popup_honeycomb.xml4
-rw-r--r--java/res/layout/keyboard_popup_stone.xml4
-rw-r--r--java/res/values-fr/donottranslate.xml12
-rw-r--r--java/res/values-it/donottranslate.xml4
-rw-r--r--java/res/values/donottranslate.xml15
-rw-r--r--java/res/values/styles.xml2
13 files changed, 34 insertions, 23 deletions
diff --git a/java/res/layout/input_basic.xml b/java/res/layout/input_basic.xml
index 86ae82d51..8666daece 100644
--- a/java/res/layout/input_basic.xml
+++ b/java/res/layout/input_basic.xml
@@ -21,7 +21,7 @@
<com.android.inputmethod.keyboard.LatinKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/LatinkeyboardBaseView"
+ android:id="@+id/latin_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/input_basic_highcontrast.xml b/java/res/layout/input_basic_highcontrast.xml
index 03b22ef07..4829c7d7c 100644
--- a/java/res/layout/input_basic_highcontrast.xml
+++ b/java/res/layout/input_basic_highcontrast.xml
@@ -21,7 +21,7 @@
<com.android.inputmethod.keyboard.LatinKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/LatinkeyboardBaseView"
+ android:id="@+id/latin_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml
index 9332f9ddf..ccca501af 100644
--- a/java/res/layout/input_gingerbread.xml
+++ b/java/res/layout/input_gingerbread.xml
@@ -21,7 +21,7 @@
<com.android.inputmethod.keyboard.LatinKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/LatinkeyboardBaseView"
+ android:id="@+id/latin_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/input_honeycomb.xml b/java/res/layout/input_honeycomb.xml
index 42bedb43c..8dadafd81 100644
--- a/java/res/layout/input_honeycomb.xml
+++ b/java/res/layout/input_honeycomb.xml
@@ -21,7 +21,7 @@
<com.android.inputmethod.keyboard.LatinKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/LatinkeyboardBaseView"
+ android:id="@+id/latin_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/input_stone_bold.xml b/java/res/layout/input_stone_bold.xml
index 22ac14eb1..a0b40684f 100644
--- a/java/res/layout/input_stone_bold.xml
+++ b/java/res/layout/input_stone_bold.xml
@@ -21,7 +21,7 @@
<com.android.inputmethod.keyboard.LatinKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/LatinkeyboardBaseView"
+ android:id="@+id/latin_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/input_stone_normal.xml b/java/res/layout/input_stone_normal.xml
index 8baecabdb..41cbc16fa 100644
--- a/java/res/layout/input_stone_normal.xml
+++ b/java/res/layout/input_stone_normal.xml
@@ -21,7 +21,7 @@
<com.android.inputmethod.keyboard.LatinKeyboardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/LatinkeyboardBaseView"
+ android:id="@+id/latin_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/keyboard_popup.xml b/java/res/layout/keyboard_popup.xml
index 013662240..0317d8deb 100644
--- a/java/res/layout/keyboard_popup.xml
+++ b/java/res/layout/keyboard_popup.xml
@@ -26,9 +26,9 @@
android:paddingLeft="@dimen/mini_keyboard_horizontal_padding"
android:paddingRight="@dimen/mini_keyboard_horizontal_padding"
>
- <com.android.inputmethod.keyboard.KeyboardView
+ <com.android.inputmethod.keyboard.PopupMiniKeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/KeyboardView"
+ android:id="@+id/mini_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/java/res/layout/keyboard_popup_honeycomb.xml b/java/res/layout/keyboard_popup_honeycomb.xml
index 96c519dd4..2ddcbdc0c 100644
--- a/java/res/layout/keyboard_popup_honeycomb.xml
+++ b/java/res/layout/keyboard_popup_honeycomb.xml
@@ -26,9 +26,9 @@
android:paddingLeft="@dimen/mini_keyboard_horizontal_padding_holo"
android:paddingRight="@dimen/mini_keyboard_horizontal_padding_holo"
>
- <com.android.inputmethod.keyboard.KeyboardView
+ <com.android.inputmethod.keyboard.PopupMiniKeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/KeyboardView"
+ android:id="@+id/mini_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/java/res/layout/keyboard_popup_stone.xml b/java/res/layout/keyboard_popup_stone.xml
index e6acee374..94176b244 100644
--- a/java/res/layout/keyboard_popup_stone.xml
+++ b/java/res/layout/keyboard_popup_stone.xml
@@ -25,9 +25,9 @@
android:orientation="horizontal"
android:background="@drawable/keyboard_popup_panel_background"
>
- <com.android.inputmethod.keyboard.KeyboardView
+ <com.android.inputmethod.keyboard.PopupMiniKeyboardView
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- android:id="@+id/KeyboardView"
+ android:id="@+id/mini_keyboard_view"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml
index 6c3536210..09c37e31a 100644
--- a/java/res/values-fr/donottranslate.xml
+++ b/java/res/values-fr/donottranslate.xml
@@ -18,8 +18,12 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Symbols that are commonly considered word separators in this language -->
- <string name="word_separators">.\u0009\u0020,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\u0022</string>
- <!-- Symbols that are sentence separators, for purposes of making it hug the last sentence. -->
- <string name="sentence_separators">.,</string>
+ <!-- Symbols that should be swapped with a magic space -->
+ <string name="magic_space_swapping_symbols">.,\u0022)]}</string>
+ <!-- Symbols that should strip a magic space -->
+ <string name="magic_space_stripping_symbols">\u0009\u0020\u0027\n-/_</string>
+ <!-- Symbols that should promote magic spaces into real space -->
+ <string name="magic_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
+ <!-- Symbols that do NOT separate words -->
+ <string name="non_word_separator_symbols">\u0027</string>
</resources>
diff --git a/java/res/values-it/donottranslate.xml b/java/res/values-it/donottranslate.xml
index 3e3f3ef2a..adb2a9a9d 100644
--- a/java/res/values-it/donottranslate.xml
+++ b/java/res/values-it/donottranslate.xml
@@ -18,6 +18,6 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Symbols that are commonly considered word separators in this language -->
- <string name="word_separators">.\u0009\u0020,;:!?\'\n()[]*&amp;@{}/&lt;&gt;_+=|\u0022</string>
+ <!-- Symbols that do NOT separate words -->
+ <string name="non_word_separator_symbols"></string>
</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 6a1069e99..1cdae3d81 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -18,12 +18,19 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Symbols that are commonly considered word separators in this language -->
- <string name="word_separators">.\u0009\u0020,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\u0022</string>
- <!-- Symbols that are sentence separators, for purposes of making it hug the last sentence. -->
- <string name="sentence_separators">.,!?)</string>
<!-- Symbols that are suggested between words -->
<string name="suggested_punctuations">!?,\u0022\u0027:();-/@_</string>
+ <!-- Symbols that should be swapped with a magic space -->
+ <string name="magic_space_swapping_symbols">.,;:!?)]}\u0022</string>
+ <!-- Symbols that should strip a magic space -->
+ <string name="magic_space_stripping_symbols">\u0009\u0020\n/_\u0027-</string>
+ <!-- Symbols that should convert magic spaces into real space -->
+ <string name="magic_space_promoting_symbols">([*&amp;@{&lt;&gt;+=|</string>
+ <!-- Symbols that do NOT separate words -->
+ <string name="non_word_separator_symbols">\u0027-</string>
+ <!-- Word separator list is the union of all symbols except those that are not separators:
+ magic_space_swapping_symbols | magic_space_stripping_symbols |
+ magic_space_neutral_symbols \ non_word_separator_symbols -->
<!-- Label for ALT modifier key. Must be short to fit on key! -->
<string name="label_alt_key">ALT</string>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index ef48a4bd2..8a4b16d7a 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -35,7 +35,7 @@
<item name="backgroundDimAmount">0.5</item>
<item name="colorScheme">white</item>
</style>
- <style name="MiniKeyboardAnimation">
+ <style name="PopupMiniKeyboardAnimation">
<item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item>
<item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item>
</style>
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-08-03 09:33:44 +0000