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

Merge "Delete gender-balanced emoji sequence by one backspace key event." into nyc-mr1-dev

Browse Source
This commit is contained in:
Raph Levien
2016-07-14 22:25:20 +00:00
committed by Android (Google) Code Review
parent 2f39bc777c f20ca2cb15
commit ef9e2a5f4b
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/text/method/BaseKeyListener.java
View File

@@ -129,8 +129,8 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener
// The offset is immediately before a variation selector.
final int STATE_BEFORE_VS = 6;
// The offset is immediately before a ZWJ emoji.
final int STATE_BEFORE_ZWJ_EMOJI = 7;
// The offset is immediately before an emoji.
final int STATE_BEFORE_EMOJI = 7;
// The offset is immediately before a ZWJ that were seen before a ZWJ emoji.
final int STATE_BEFORE_ZWJ = 8;
// The offset is immediately before a variation selector and a ZWJ that were seen before a
@@ -169,7 +169,7 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener
} else if (codePoint == Emoji.COMBINING_ENCLOSING_KEYCAP) {
state = STATE_BEFORE_KEYCAP;
} else if (Emoji.isEmoji(codePoint)) {
state = STATE_BEFORE_ZWJ_EMOJI;
state = STATE_BEFORE_EMOJI;
} else {
state = STATE_FINISHED;
}
@@ -232,7 +232,7 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener
case STATE_BEFORE_VS:
if (Emoji.isEmoji(codePoint)) {
deleteCharCount += Character.charCount(codePoint);
state = STATE_BEFORE_ZWJ_EMOJI;
state = STATE_BEFORE_EMOJI;
break;
}
@@ -242,7 +242,7 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener
}
state = STATE_FINISHED;
break;
case STATE_BEFORE_ZWJ_EMOJI:
case STATE_BEFORE_EMOJI:
if (codePoint == Emoji.ZERO_WIDTH_JOINER) {
state = STATE_BEFORE_ZWJ;
} else {
@@ -252,7 +252,8 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener
case STATE_BEFORE_ZWJ:
if (Emoji.isEmoji(codePoint)) {
deleteCharCount += Character.charCount(codePoint) + 1; // +1 for ZWJ.
state = STATE_BEFORE_ZWJ_EMOJI;
state = Emoji.isEmojiModifier(codePoint) ?
STATE_BEFORE_EMOJI_MODIFIER : STATE_BEFORE_EMOJI;
} else if (isVariationSelector(codePoint)) {
lastSeenVSCharCount = Character.charCount(codePoint);
state = STATE_BEFORE_VS_AND_ZWJ;
@@ -265,7 +266,7 @@ public abstract class BaseKeyListener extends MetaKeyKeyListener
// +1 for ZWJ.
deleteCharCount += lastSeenVSCharCount + 1 + Character.charCount(codePoint);
lastSeenVSCharCount = 0;
state = STATE_BEFORE_ZWJ_EMOJI;
state = STATE_BEFORE_EMOJI;
} else {
state = STATE_FINISHED;
}

12
core/tests/coretests/src/android/text/method/BackspaceTest.java
View File

@@ -174,6 +174,11 @@ public class BackspaceTest extends KeyListenerTestCase {
backspace(state, 0);
state.assertEquals("|");
// Emoji modifier can be appended to the first emoji.
state.setByString("U+1F469 U+1F3FB U+200D U+1F4BC |");
backspace(state, 0);
state.assertEquals("|");
// End with ZERO WIDTH JOINER
state.setByString("U+1F441 U+200D |");
backspace(state, 0);
@@ -445,13 +450,6 @@ public class BackspaceTest extends KeyListenerTestCase {
backspace(state, 0);
state.assertEquals("|");
// Emoji modifier + ZERO WIDTH JOINER
state.setByString("U+1F466 U+1F3FB U+200D U+1F469 |");
backspace(state, 0);
state.assertEquals("U+1F466 |");
backspace(state, 0);
state.assertEquals("|");
// Regional indicator symbol + Emoji modifier
state.setByString("U+1F1FA U+1F3FB |");
backspace(state, 0);