Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdbf6fb5 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

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

parents f732f4dd c5653daf

java/res/values-fr/donottranslate.xml

+3 −2
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- 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 -->

    <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 -->

    <string name="phantom_space_promoting_symbols">;:!?([*&amp;@{&lt;&gt;+=|</string>

    <!-- Symbols that do NOT separate words -->

java/res/values/donottranslate.xml

+3 −2
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 
    <!-- Symbols that are suggested between words -->

    <string name="suggested_punctuations">!,?,\\,,:,;,\",(,),\',-,/,@,_</string>

    <!-- 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 -->

    <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 -->

    <string name="phantom_space_promoting_symbols">([*&amp;{&lt;&gt;+=|</string>

    <!-- Symbols that do NOT separate words -->

tests/src/com/android/inputmethod/latin/BlueUnderlineTests.java

+16 −0
Original line number Diff line number Diff line
@@ -104,4 +104,20 @@ public class BlueUnderlineTests extends InputTestsBase { 
        final SpanGetter span = new SpanGetter(mTextView.getText(), SuggestionSpan.class);

        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);

    }

}