aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/values/donottranslate.xml2
-rw-r--r--java/res/xml-sw600dp/kbd_key_styles.xml15
-rw-r--r--java/res/xml-sw600dp/kbd_rows_symbols_shift.xml19
-rw-r--r--java/res/xml-sw768dp/kbd_key_styles.xml15
-rw-r--r--java/res/xml-sw768dp/kbd_rows_symbols_shift.xml19
-rw-r--r--java/res/xml/kbd_key_styles.xml23
-rw-r--r--java/res/xml/kbd_rows_symbols_shift.xml13
-rw-r--r--java/res/xml/kbd_symbols_shift_row4.xml8
-rw-r--r--java/src/com/android/inputmethod/keyboard/Key.java6
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java7
10 files changed, 6 insertions, 121 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index f55e9bf53..5cd995be9 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -35,7 +35,7 @@
<!-- Label for "switch to more symbol" modifier key. Must be short to fit on key! -->
<string name="label_to_more_symbol_key">= \\ &lt;</string>
<!-- Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key! -->
- <string name="label_to_more_symbol_for_tablet_key">\\ ^ [ {</string>
+ <string name="label_to_more_symbol_for_tablet_key">~ \\ {</string>
<!-- Label for "Tab" key. Must be short to fit on key! -->
<string name="label_tab_key">Tab</string>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index 15a3d1df5..b93d3007f 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -118,19 +118,4 @@
latin:keyLabelOption="fontNormal|hasPopupHint"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:popupCharacters="@string/alternates_for_popular_domain" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <key-style
- latin:styleName="nonPasswordSymbolKeyStyle"
- latin:enabled="false" />
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <key-style
- latin:styleName="nonPasswordSymbolKeyStyle"
- latin:enabled="true" />
- </default>
- </switch>
</merge>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
index 2909acb6f..c5143d9c8 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
@@ -33,28 +33,21 @@
<Key
latin:keyLabel="|" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="•"
latin:popupCharacters="♪,♥,♠,♦,♣" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="√" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="π"
latin:popupCharacters="Π" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="÷" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="×" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="§"
latin:popupCharacters="¶" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="Δ" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -65,27 +58,21 @@
latin:keyWidth="9.0%p"
>
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="£"
latin:keyXPos="4.5%p" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¢" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="€" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¥" />
<Key
latin:keyLabel="^"
latin:popupCharacters="↑,↓,←,→" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="°"
latin:popupCharacters="′,″" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="±"
latin:popupCharacters="∞" />
<Key
@@ -106,26 +93,20 @@
<Key
latin:keyLabel="\\" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="©" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="®" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="™" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="℅" />
<Key
latin:keyLabel="[" />
<Key
latin:keyLabel="]" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¡" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¿" />
</Row>
<Row
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
index 1711c423f..7c74bb5ad 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/kbd_key_styles.xml
@@ -104,19 +104,4 @@
latin:keyLabelOption="fontNormal|hasPopupHint"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:popupCharacters="@string/alternates_for_popular_domain" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <key-style
- latin:styleName="nonPasswordSymbolKeyStyle"
- latin:enabled="false" />
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <key-style
- latin:styleName="nonPasswordSymbolKeyStyle"
- latin:enabled="true" />
- </default>
- </switch>
</merge>
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
index 1f43a0f91..82bc4b26e 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml
@@ -37,28 +37,21 @@
<Key
latin:keyLabel="|" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="•"
latin:popupCharacters="♪,♥,♠,♦,♣" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="√" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="π"
latin:popupCharacters="Π" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="÷" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="×" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="§"
latin:popupCharacters="¶" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="Δ" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -73,26 +66,20 @@
latin:keyLabelOption="alignLeft"
latin:keyWidth="11.172%p" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="£" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¢" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="€" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¥" />
<Key
latin:keyLabel="^"
latin:popupCharacters="↑,↓,←,→" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="°"
latin:popupCharacters="′,″" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="±"
latin:popupCharacters="∞" />
<Key
@@ -113,26 +100,20 @@
<Key
latin:keyLabel="\\" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="©" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="®" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="™" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="℅" />
<Key
latin:keyLabel="[" />
<Key
latin:keyLabel="]" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¡" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¿" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 5612251a5..48468987e 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -215,29 +215,6 @@
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
latin:parentStyle="functionalKeyStyle" />
- <switch>
- <case
- latin:passwordInput="true"
- >
- <key-style
- latin:styleName="nonPasswordSymbolKeyStyle"
- latin:enabled="false" />
- <key-style
- latin:styleName="nonPasswordFunctionalKeyStyle"
- latin:enabled="false"
- latin:parentStyle="functionalKeyStyle" />
- </case>
- <!-- latin:passwordInput="false" -->
- <default>
- <key-style
- latin:styleName="nonPasswordSymbolKeyStyle"
- latin:enabled="true" />
- <key-style
- latin:styleName="nonPasswordFunctionalKeyStyle"
- latin:enabled="true"
- latin:parentStyle="functionalKeyStyle" />
- </default>
- </switch>
<key-style
latin:styleName="punctuationKeyStyle"
latin:keyLabel="."
diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/kbd_rows_symbols_shift.xml
index d52341512..ff272f1b0 100644
--- a/java/res/xml/kbd_rows_symbols_shift.xml
+++ b/java/res/xml/kbd_rows_symbols_shift.xml
@@ -33,21 +33,16 @@
<Key
latin:keyLabel="|" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="•"
latin:popupCharacters="♪,♥,♠,♦,♣" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="√" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="π"
latin:popupCharacters="Π" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="÷" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="×" />
<Key
latin:keyLabel="{" />
@@ -61,16 +56,12 @@
<Key
latin:keyStyle="nonSpecialBackgroundTabKeyStyle" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="£" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¢" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="€" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="°"
latin:popupCharacters="′,″" />
<Key
@@ -95,16 +86,12 @@
latin:keyWidth="15%p"
latin:visualInsetsRight="1%p" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="™" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="®" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="©" />
<Key
- latin:keyStyle="nonPasswordSymbolKeyStyle"
latin:keyLabel="¶"
latin:popupCharacters="§" />
<Key
diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/kbd_symbols_shift_row4.xml
index 9cb453fbc..bcab19b06 100644
--- a/java/res/xml/kbd_symbols_shift_row4.xml
+++ b/java/res/xml/kbd_symbols_shift_row4.xml
@@ -35,13 +35,13 @@
<Key
latin:keyLabel="„"
latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛"
- latin:keyStyle="nonPasswordFunctionalKeyStyle" />
+ latin:keyStyle="functionalKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="50%p" />
<Key
latin:keyLabel="…"
- latin:keyStyle="nonPasswordFunctionalKeyStyle" />
+ latin:keyStyle="functionalKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />
@@ -57,14 +57,14 @@
latin:keyLabel="„"
latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛"
latin:keyWidth="9.2%p"
- latin:keyStyle="nonPasswordFunctionalKeyStyle" />
+ latin:keyStyle="functionalKeyStyle" />
<Key
latin:keyStyle="spaceKeyStyle"
latin:keyWidth="35.83%p" />
<Key
latin:keyLabel="…"
latin:keyWidth="9.2%p"
- latin:keyStyle="nonPasswordFunctionalKeyStyle" />
+ latin:keyStyle="functionalKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 397b7b16b..f56b52388 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -295,12 +295,8 @@ public class Key {
mY = y;
mWidth = keyWidth - mHorizontalGap;
- CharSequence[] popupCharacters = style.getTextArray(
+ final CharSequence[] popupCharacters = style.getTextArray(
keyAttr, R.styleable.Keyboard_Key_popupCharacters);
- if (params.mId.mPasswordInput) {
- popupCharacters = PopupCharactersParser.filterOut(
- res, popupCharacters, PopupCharactersParser.NON_ASCII_FILTER);
- }
// In Arabic symbol layouts, we'd like to keep digits in popup characters regardless of
// config_digit_popup_characters_enabled.
if (params.mId.isAlphabetKeyboard() && !res.getBoolean(
diff --git a/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java b/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java
index 032489e66..7c5abe32a 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/PopupCharactersParser.java
@@ -196,13 +196,6 @@ public class PopupCharactersParser {
}
};
- public static final CodeFilter NON_ASCII_FILTER = new CodeFilter() {
- @Override
- public boolean shouldFilterOut(int code) {
- return code < 0x20 || code > 0x7e;
- }
- };
-
public static CharSequence[] filterOut(Resources res, CharSequence[] popupCharacters,
CodeFilter filter) {
if (popupCharacters == null || popupCharacters.length < 1) {
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-05 11:38:27 +0000