nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev 

* commit 'b9385ff9be484487a523c1eb6db4eba33ef2359d':
  Correctly add double quote to the space strippers
main
Jean Chalard 2012-11-20 19:42:18 -08:00 committed by Android Git Automerger
parent b7e6bbaebc b9385ff9be
commit 82cc734925
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/res/values-fr/donottranslate.xml
View File

@ -19,9 +19,10 @@
--> -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Symbols that should be swapped with a magic space --> <!-- Symbols that should be swapped with a magic space -->
<string name="weak_space_swapping_symbols">.,\")]}</string> <string name="weak_space_swapping_symbols">.,)]}</string>
<!-- Symbols that should strip a magic space --> <!-- Symbols that should strip a magic space -->
<string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\'\n-/_"</string> <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
<string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\n"\'-/_\"</string>
<!-- Symbols that should promote magic spaces into real space --> <!-- Symbols that should promote magic spaces into real space -->
<string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string> <string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>
<!-- Symbols that do NOT separate words --> <!-- Symbols that do NOT separate words -->

5
java/res/values/donottranslate.xml
View File

@ -21,9 +21,10 @@
<!-- Symbols that are suggested between words --> <!-- Symbols that are suggested between words -->
<string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string> <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string>
<!-- Symbols that should be swapped with a weak space --> <!-- Symbols that should be swapped with a weak space -->
<string name="weak_space_swapping_symbols">.,;:!?)]}\"</string> <string name="weak_space_swapping_symbols">.,;:!?)]}</string>
<!-- Symbols that should strip a weak space --> <!-- Symbols that should strip a weak space -->
<string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\n/_\'-"@</string> <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
<string name="weak_space_stripping_symbols">"&#x0009;&#x0020;\n"/_\'-@\"</string>
<!-- Symbols that should convert weak spaces into real space --> <!-- Symbols that should convert weak spaces into real space -->
<string name="phantom_space_promoting_symbols">([*&amp;{&lt;&gt;+=|</string> <string name="phantom_space_promoting_symbols">([*&amp;{&lt;&gt;+=|</string>
<!-- Symbols that do NOT separate words --> <!-- Symbols that do NOT separate words -->

16
tests/src/com/android/inputmethod/latin/BlueUnderlineTests.java
View File

@ -104,4 +104,20 @@ public class BlueUnderlineTests extends InputTestsBase {
final SpanGetter span = new SpanGetter(mTextView.getText(), SuggestionSpan.class); final SpanGetter span = new SpanGetter(mTextView.getText(), SuggestionSpan.class);
assertNull("blue underline removed when cursor is moved", span.mSpan); assertNull("blue underline removed when cursor is moved", span.mSpan);
} }
public void testComposingStopsOnSpace() {
final String STRING_TO_TYPE = "this ";
type(STRING_TO_TYPE);
sleep(DELAY_TO_WAIT_FOR_UNDERLINE);
// Simulate the onUpdateSelection() event
mLatinIME.onUpdateSelection(0, 0, STRING_TO_TYPE.length(), STRING_TO_TYPE.length(), -1, -1);
runMessages();
// Here the blue underline has been set. testBlueUnderline() is testing for this already,
// so let's not test it here again.
// Now simulate the user moving the cursor.
SpanGetter span = new SpanGetter(mTextView.getText(), UnderlineSpan.class);
assertNull("should not be composing, so should not have an underline span", span.mSpan);
span = new SpanGetter(mTextView.getText(), SuggestionSpan.class);
assertNull("should not be composing, so should not have an underline span", span.mSpan);
}
} }