Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow international characters input with apostrophe and double quotation"

Browse Source
This commit is contained in:
Josep del Río
2022-12-08 20:31:13 +00:00
committed by Android (Google) Code Review
parent 2aaf9030be d9c573d143
commit 353350bab1
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/KeyCharacterMap.java
View File

@@ -177,6 +177,8 @@ public class KeyCharacterMap implements Parcelable {
private static final int ACCENT_UMLAUT = '\u00A8';
private static final int ACCENT_VERTICAL_LINE_ABOVE = '\u02C8';
private static final int ACCENT_VERTICAL_LINE_BELOW = '\u02CC';
private static final int ACCENT_APOSTROPHE = '\'';
private static final int ACCENT_QUOTATION_MARK = '"';
/* Legacy dead key display characters used in previous versions of the API.
* We still support these characters by mapping them to their non-legacy version. */
@@ -204,8 +206,6 @@ public class KeyCharacterMap implements Parcelable {
addCombining('\u030A', ACCENT_RING_ABOVE);
addCombining('\u030B', ACCENT_DOUBLE_ACUTE);
addCombining('\u030C', ACCENT_CARON);
addCombining('\u030D', ACCENT_VERTICAL_LINE_ABOVE);
//addCombining('\u030E', ACCENT_DOUBLE_VERTICAL_LINE_ABOVE);
//addCombining('\u030F', ACCENT_DOUBLE_GRAVE);
//addCombining('\u0310', ACCENT_CANDRABINDU);
//addCombining('\u0311', ACCENT_INVERTED_BREVE);
@@ -229,11 +229,17 @@ public class KeyCharacterMap implements Parcelable {
sCombiningToAccent.append('\u0340', ACCENT_GRAVE);
sCombiningToAccent.append('\u0341', ACCENT_ACUTE);
sCombiningToAccent.append('\u0343', ACCENT_COMMA_ABOVE);
sCombiningToAccent.append('\u030D', ACCENT_APOSTROPHE);
sCombiningToAccent.append('\u030E', ACCENT_QUOTATION_MARK);
// One-way legacy mappings to preserve compatibility with older applications.
sAccentToCombining.append(ACCENT_GRAVE_LEGACY, '\u0300');
sAccentToCombining.append(ACCENT_CIRCUMFLEX_LEGACY, '\u0302');
sAccentToCombining.append(ACCENT_TILDE_LEGACY, '\u0303');
// One-way mappings to use the preferred accent
sAccentToCombining.append(ACCENT_APOSTROPHE, '\u0301');
sAccentToCombining.append(ACCENT_QUOTATION_MARK, '\u0308');
}
private static void addCombining(int combining, int accent) {

8
packages/InputDevices/res/raw/keyboard_layout_english_us_intl.kcm
View File

@@ -292,10 +292,10 @@ key SEMICOLON {
key APOSTROPHE {
label: '\''
base: '\''
shift: '"'
ralt: '\u0301'
shift+ralt: '\u0308'
base: '\u030D'
shift: '\u030E'
ralt: '\u00B4'
shift+ralt: '\u00A8'
}
### ROW 4