aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/drawable-hdpi/btn_close_normal.pngbin1884 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_close_pressed.pngbin2737 -> 0 bytes
-rw-r--r--java/res/drawable-hdpi/btn_close_selected.pngbin2807 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_close_normal.pngbin1259 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_close_pressed.pngbin1726 -> 0 bytes
-rw-r--r--java/res/drawable-mdpi/btn_close_selected.pngbin1716 -> 0 bytes
-rw-r--r--java/res/drawable/btn_close.xml27
-rwxr-xr-xjava/res/layout/input_gingerbread_popup.xml9
-rwxr-xr-xjava/res/layout/input_stone_popup.xml9
-rw-r--r--java/res/layout/keyboard_popup_keyboard.xml9
-rw-r--r--java/res/values-en/donottranslate.xml31
-rw-r--r--java/res/values/donottranslate.xml10
-rw-r--r--java/res/values/styles.xml2
-rwxr-xr-xjava/res/xml/kbd_qwerty.xml21
-rwxr-xr-xjava/res/xml/kbd_qwerty_black.xml21
15 files changed, 72 insertions, 67 deletions
diff --git a/java/res/drawable-hdpi/btn_close_normal.png b/java/res/drawable-hdpi/btn_close_normal.png
deleted file mode 100644
index 38b49f1a3..000000000
--- a/java/res/drawable-hdpi/btn_close_normal.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_close_pressed.png b/java/res/drawable-hdpi/btn_close_pressed.png
deleted file mode 100644
index aa9ea49f0..000000000
--- a/java/res/drawable-hdpi/btn_close_pressed.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_close_selected.png b/java/res/drawable-hdpi/btn_close_selected.png
deleted file mode 100644
index 870c670f7..000000000
--- a/java/res/drawable-hdpi/btn_close_selected.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_close_normal.png b/java/res/drawable-mdpi/btn_close_normal.png
deleted file mode 100644
index 4c6e79dc8..000000000
--- a/java/res/drawable-mdpi/btn_close_normal.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_close_pressed.png b/java/res/drawable-mdpi/btn_close_pressed.png
deleted file mode 100644
index fc983afdc..000000000
--- a/java/res/drawable-mdpi/btn_close_pressed.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_close_selected.png b/java/res/drawable-mdpi/btn_close_selected.png
deleted file mode 100644
index f2bf91a2d..000000000
--- a/java/res/drawable-mdpi/btn_close_selected.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/btn_close.xml b/java/res/drawable/btn_close.xml
deleted file mode 100644
index ee5813898..000000000
--- a/java/res/drawable/btn_close.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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_pressed="false" android:state_focused="false"
- android:drawable="@drawable/btn_close_normal" />
-
- <item android:state_pressed="true"
- android:drawable="@drawable/btn_close_pressed" />
-
- <item android:state_focused="true"
- android:drawable="@drawable/btn_close_selected" />
-</selector>
diff --git a/java/res/layout/input_gingerbread_popup.xml b/java/res/layout/input_gingerbread_popup.xml
index 0f0f080b5..0cc953edf 100755
--- a/java/res/layout/input_gingerbread_popup.xml
+++ b/java/res/layout/input_gingerbread_popup.xml
@@ -36,13 +36,4 @@
latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
latin:popupLayout="@layout/input_gingerbread_popup"
/>
- <ImageButton android:id="@+id/closeButton"
- android:background="@android:color/transparent"
- android:src="@drawable/btn_close"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="8dp"
- android:clickable="true"
- />
</LinearLayout>
diff --git a/java/res/layout/input_stone_popup.xml b/java/res/layout/input_stone_popup.xml
index 1efa56c5e..f159625f7 100755
--- a/java/res/layout/input_stone_popup.xml
+++ b/java/res/layout/input_stone_popup.xml
@@ -38,13 +38,4 @@
latin:shadowColor="@color/latinkeyboard_key_color_white"
latin:popupLayout="@layout/input_stone_popup"
/>
- <ImageButton android:id="@+id/closeButton"
- android:background="@android:color/transparent"
- android:src="@drawable/btn_close"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="8dp"
- android:clickable="true"
- />
</LinearLayout>
diff --git a/java/res/layout/keyboard_popup_keyboard.xml b/java/res/layout/keyboard_popup_keyboard.xml
index 0b0046a49..6d3985065 100644
--- a/java/res/layout/keyboard_popup_keyboard.xml
+++ b/java/res/layout/keyboard_popup_keyboard.xml
@@ -36,13 +36,4 @@
latin:keyPreviewLayout="@layout/keyboard_key_preview"
latin:popupLayout="@layout/keyboard_popup_keyboard"
/>
- <ImageButton android:id="@+id/closeButton"
- android:background="@android:color/transparent"
- android:src="@drawable/btn_close"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginLeft="8dp"
- android:clickable="true"
- />
</LinearLayout>
diff --git a/java/res/values-en/donottranslate.xml b/java/res/values-en/donottranslate.xml
new file mode 100644
index 000000000..f5692735a
--- /dev/null
+++ b/java/res/values-en/donottranslate.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Accented forms of "e" -->
+ <string name="alternates_for_e">èéêë3</string>
+ <!-- Accented forms of "i" -->
+ <string name="alternates_for_i">ìíîï8</string>
+ <!-- Accented forms of "o" -->
+ <string name="alternates_for_o">òóôõöœø9</string>
+ <!-- Accented forms of "u" -->
+ <string name="alternates_for_u">ùúûü7</string>
+ <!-- Accented forms of "y" -->
+ <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index b7bfd9c3a..97b645c4a 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -24,16 +24,22 @@
<string name="sentence_separators">.,!?)</string>
<!-- Symbols that are suggested between words -->
<string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string>
+ <!-- Accented characters related to "q" -->
+ <string name="alternates_for_q">1</string>
+ <!-- Accented characters related to "w" -->
+ <string name="alternates_for_w">2</string>
<!-- Accented characters related to "d" -->
<string name="alternates_for_d"></string>
<!-- Accented characters related to "r" -->
- <string name="alternates_for_r"></string>
+ <string name="alternates_for_r">4</string>
<!-- Accented characters related to "t" -->
- <string name="alternates_for_t"></string>
+ <string name="alternates_for_t">5</string>
<!-- Accented characters related to "z" -->
<string name="alternates_for_z"></string>
<!-- Accented characters related to "l" -->
<string name="alternates_for_l"></string>
<!-- Accented characters related to "g" -->
<string name="alternates_for_g"></string>
+ <!-- Accented characters related to "p" -->
+ <string name="alternates_for_p">0</string>
</resources>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 24fee02d8..16478c883 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -22,7 +22,7 @@
<item name="keyTextSize">@dimen/key_text_size</item>
<item name="keyTextColor">#FFFFFFFF</item>
<item name="keyPreviewLayout">@layout/keyboard_key_preview</item>
- <item name="keyPreviewOffset">-12dip</item>
+ <item name="keyPreviewOffset">5dip</item>
<item name="keyPreviewHeight">80dip</item>
<item name="labelTextSize">14sp</item>
<item name="popupLayout">@layout/keyboard_popup_keyboard</item>
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index 0a0691dd1..0aeaf6cc7 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -29,18 +29,26 @@
>
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
+ <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q"
+ />
+ <Key android:codes="119" android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w"
+ />
<Key android:codes="101" android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e"
/>
<Key android:codes="114" android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_r"/>
+ android:popupCharacters="@string/alternates_for_r"
+ />
<Key android:codes="116" android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_t"/>
+ android:popupCharacters="@string/alternates_for_t"
+ />
<Key android:codes="121" android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y"
@@ -57,7 +65,10 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o"
/>
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+ <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p"
+ />
</Row>
<Row>
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index 286547283..8b68d7500 100755
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -26,18 +26,26 @@
>
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
+ <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q"
+ />
+ <Key android:codes="119" android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w"
+ />
<Key android:codes="101" android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e"
/>
<Key android:codes="114" android:keyLabel="r"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_r"/>
+ android:popupCharacters="@string/alternates_for_r"
+ />
<Key android:codes="116" android:keyLabel="t"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_t"/>
+ android:popupCharacters="@string/alternates_for_t"
+ />
<Key android:codes="121" android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_y"
@@ -54,7 +62,10 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_o"
/>
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+ <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p"
+ />
</Row>
<Row>
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-24 12:11:48 +0000