diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/raw/main_en.dict | bin | 1069228 -> 1069229 bytes | |||
-rw-r--r-- | java/res/raw/main_fr.dict | bin | 1330249 -> 1328417 bytes | |||
-rw-r--r-- | java/res/values-en/whitelist.xml | 513 | ||||
-rw-r--r-- | java/res/values-sw600dp/dimens.xml | 1 | ||||
-rw-r--r-- | java/res/values-sw768dp/dimens.xml | 1 | ||||
-rw-r--r-- | java/res/values/attrs.xml | 5 | ||||
-rw-r--r-- | java/res/values/dimens.xml | 1 | ||||
-rw-r--r-- | java/res/values/strings.xml | 14 | ||||
-rw-r--r-- | java/res/values/styles.xml | 1 | ||||
-rw-r--r-- | java/res/xml-sw600dp/key_styles_common.xml | 9 | ||||
-rw-r--r-- | java/res/xml/key_styles_number.xml | 9 | ||||
-rw-r--r-- | java/res/xml/rows_number_normal.xml | 2 |
12 files changed, 40 insertions, 516 deletions
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict Binary files differindex 2cfa35168..f544da61a 100644 --- a/java/res/raw/main_en.dict +++ b/java/res/raw/main_en.dict diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict Binary files differindex cfa9f473d..084ef7c10 100644 --- a/java/res/raw/main_fr.dict +++ b/java/res/raw/main_fr.dict diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml index bcb884e1d..29a828c7e 100644 --- a/java/res/values-en/whitelist.xml +++ b/java/res/values-en/whitelist.xml @@ -30,62 +30,15 @@ <item>ill</item> <item>I\'ll</item> - <!-- Following entries came from AutoText --> - <!-- TODO: Trim down these entries by removing ones getting auto-corrected by the typing - error correction algorithms. --> - <item>255</item> - <item>abouta</item> - <item>about a</item> - - <item>255</item> - <item>aboutit</item> - <item>about it</item> - - <item>255</item> - <item>aboutthe</item> - <item>about the</item> - - <item>255</item> - <item>acheive</item> - <item>achieve</item> - - <item>255</item> - <item>acheived</item> - <item>achieved</item> - - <item>255</item> - <item>acheiving</item> - <item>achieving</item> + <!-- Following entries came from AutoText the Android keyboard no longer uses. --> + <!-- TODO: Trim down more entries by removing ones that get auto-corrected by the + Android keyboard's own typing error correction algorithms. --> <item>255</item> <item>acomodate</item> <item>accommodate</item> <item>255</item> - <item>accomodate</item> - <item>accommodate</item> - - <item>255</item> - <item>acn</item> - <item>can</item> - - <item>255</item> - <item>adn</item> - <item>and</item> - - <item>255</item> - <item>agian</item> - <item>again</item> - - <item>255</item> - <item>ahd</item> - <item>had</item> - - <item>255</item> - <item>ahve</item> - <item>have</item> - - <item>255</item> <item>aint</item> <item>ain\'t</item> @@ -94,82 +47,14 @@ <item>a lot</item> <item>255</item> - <item>amde</item> - <item>made</item> - - <item>255</item> - <item>amke</item> - <item>make</item> - - <item>255</item> - <item>andone</item> - <item>and one</item> - - <item>255</item> <item>andteh</item> <item>and the</item> <item>255</item> - <item>anothe</item> - <item>another</item> - - <item>255</item> <item>arent</item> <item>aren\'t</item> <item>255</item> - <item>asthe</item> - <item>as the</item> - - <item>255</item> - <item>atthe</item> - <item>at the</item> - - <item>255</item> - <item>bakc</item> - <item>back</item> - - <item>255</item> - <item>beacuse</item> - <item>because</item> - - <item>255</item> - <item>becasue</item> - <item>because</item> - - <item>255</item> - <item>becaus</item> - <item>because</item> - - <item>255</item> - <item>becausea</item> - <item>because a</item> - - <item>255</item> - <item>becauseof</item> - <item>because of</item> - - <item>255</item> - <item>becausethe</item> - <item>because the</item> - - <item>255</item> - <item>becauseyou</item> - <item>because you</item> - - <item>255</item> - <item>becuase</item> - <item>because</item> - - <item>255</item> - <item>becuse</item> - <item>because</item> - - <item>255</item> - <item>beleive</item> - <item>believe</item> - - <item>255</item> <item>bot</item> <item>not</item> @@ -178,126 +63,18 @@ <item>but</item> <item>255</item> - <item>butthe</item> - <item>but the</item> - - <item>255</item> <item>cant</item> <item>can\'t</item> <item>255</item> - <item>certian</item> - <item>certain</item> - - <item>255</item> - <item>changable</item> - <item>changeable</item> - - <item>255</item> - <item>chekc</item> - <item>check</item> - - <item>255</item> - <item>chnage</item> - <item>change</item> - - <item>255</item> - <item>couldnt</item> - <item>couldn\'t</item> - - <item>255</item> - <item>couldthe</item> - <item>could the</item> - - <item>255</item> - <item>couldve</item> - <item>could\'ve</item> - - <item>255</item> - <item>cna</item> - <item>can</item> - - <item>255</item> - <item>committment</item> - <item>commitment</item> - - <item>255</item> - <item>committments</item> - <item>commitments</item> - - <item>255</item> - <item>companys</item> - <item>company\'s</item> - - <item>255</item> - <item>cxan</item> - <item>can</item> - - <item>255</item> <item>didint</item> <item>didn\'t</item> <item>255</item> - <item>didnot</item> - <item>did not</item> - - <item>255</item> - <item>didnt</item> - <item>didn\'t</item> - - <item>255</item> - <item>doesnt</item> - <item>doesn\'t</item> - - <item>255</item> - <item>dont</item> - <item>don\'t</item> - - <item>255</item> - <item>eyt</item> - <item>yet</item> - - <item>255</item> - <item>fidn</item> - <item>find</item> - - <item>255</item> <item>fora</item> <item>for a</item> <item>255</item> - <item>freind</item> - <item>friend</item> - - <item>255</item> - <item>friday</item> - <item>Friday</item> - - <item>255</item> - <item>hadbeen</item> - <item>had been</item> - - <item>255</item> - <item>hadnt</item> - <item>hadn\'t</item> - - <item>255</item> - <item>haev</item> - <item>have</item> - - <item>255</item> - <item>hasbeen</item> - <item>has been</item> - - <item>255</item> - <item>hasnt</item> - <item>hasn\'t</item> - - <item>255</item> - <item>havent</item> - <item>haven\'t</item> - - <item>255</item> <item>hed</item> <item>he\'d</item> @@ -310,14 +87,6 @@ <item>here\'s</item> <item>255</item> - <item>hes</item> - <item>he\'s</item> - - <item>255</item> - <item>hlep</item> - <item>help</item> - - <item>255</item> <item>hoe</item> <item>how</item> @@ -342,18 +111,6 @@ <item>how\'ve</item> <item>255</item> - <item>hte</item> - <item>the</item> - - <item>255</item> - <item>htis</item> - <item>this</item> - - <item>255</item> - <item>hvae</item> - <item>have</item> - - <item>255</item> <item>i</item> <item>I</item> @@ -366,50 +123,18 @@ <item>I\'m</item> <item>255</item> - <item>i\'m</item> - <item>I\'m</item> - - <item>255</item> - <item>i\'ll</item> - <item>I\'ll</item> - - <item>255</item> - <item>i\'ve</item> - <item>I\'ve</item> - - <item>255</item> <item>inteh</item> <item>in the</item> <item>255</item> - <item>isnt</item> - <item>isn\'t</item> - - <item>255</item> - <item>isthe</item> - <item>is the</item> - - <item>255</item> <item>itd</item> <item>it\'d</item> <item>255</item> - <item>itis</item> - <item>it is</item> - - <item>255</item> - <item>itll</item> - <item>it\'ll</item> - - <item>255</item> <item>itsa</item> <item>it\'s a</item> <item>255</item> - <item>ive</item> - <item>I\'ve</item> - - <item>255</item> <item>jot</item> <item>not</item> @@ -426,217 +151,42 @@ <item>more</item> <item>255</item> - <item>mkae</item> - <item>make</item> - - <item>255</item> - <item>mkaes</item> - <item>makes</item> - - <item>255</item> <item>moat</item> <item>most</item> <item>255</item> - <item>monday</item> - <item>Monday</item> - - <item>255</item> <item>mot</item> <item>not</item> <item>255</item> - <item>mustnt</item> - <item>mustn\'t</item> - - <item>255</item> - <item>neednt</item> - <item>needn\'t</item> - - <item>255</item> <item>nit</item> <item>not</item> <item>255</item> - <item>oclock</item> - <item>o\'clock</item> - - <item>255</item> - <item>ofits</item> - <item>of its</item> - - <item>255</item> - <item>ofthe</item> - <item>of the</item> - - <item>255</item> - <item>omre</item> - <item>more</item> - - <item>255</item> - <item>oneof</item> - <item>one of</item> - - <item>255</item> <item>os</item> <item>is</item> <item>255</item> - <item>otehr</item> - <item>other</item> - - <item>255</item> - <item>outof</item> - <item>out of</item> - - <item>255</item> - <item>overthe</item> - <item>over the</item> - - <item>255</item> - <item>owrk</item> - <item>work</item> - - <item>255</item> - <item>percentof</item> - <item>percent of</item> - - <item>255</item> - <item>recieve</item> - <item>receive</item> - - <item>255</item> - <item>recieved</item> - <item>received</item> - - <item>255</item> - <item>recieving</item> - <item>receiving</item> - - <item>255</item> - <item>saidthat</item> - <item>said that</item> - - <item>255</item> - <item>saidthe</item> - <item>said the</item> - - <item>255</item> - <item>saturday</item> - <item>Saturday</item> - - <item>255</item> - <item>seh</item> - <item>she</item> - - <item>255</item> - <item>shant</item> - <item>shan\'t</item> - - <item>255</item> - <item>she\'</item> - <item>she\'ll</item> - - <item>255</item> <item>shel</item> <item>she\'ll</item> <item>255</item> - <item>shes</item> - <item>she\'s</item> - - <item>255</item> <item>shouldent</item> <item>shouldn\'t</item> + <!-- TODO: Remove this entry after "yes" gets bumped up in the dictionary. --> <item>255</item> - <item>shouldnt</item> - <item>shouldn\'t</item> - - <item>255</item> - <item>shouldve</item> - <item>should\'ve</item> - - <item>255</item> - <item>sone</item> - <item>some</item> - - <item>255</item> - <item>sunday</item> - <item>Sunday</item> - - <item>255</item> - <item>tahn</item> - <item>than</item> - - <item>255</item> - <item>taht</item> - <item>that</item> - - <item>255</item> - <item>teh</item> - <item>the</item> + <item>tes</item> + <item>yes</item> <item>255</item> <item>thatd</item> <item>that\'d</item> <item>255</item> - <item>thatll</item> - <item>that\'ll</item> - - <item>255</item> - <item>thats</item> - <item>that\'s</item> - - <item>255</item> - <item>thatthe</item> - <item>that the</item> - - <item>255</item> - <item>theres</item> - <item>there\'s</item> - - <item>255</item> - <item>theyd</item> - <item>they\'d</item> - - <item>255</item> - <item>theyll</item> - <item>they\'ll</item> - - <item>255</item> - <item>theyre</item> - <item>they\'re</item> - - <item>255</item> - <item>theyve</item> - <item>they\'ve</item> - - <item>255</item> - <item>thier</item> - <item>their</item> - - <item>255</item> - <item>thsi</item> - <item>this</item> - - <item>255</item> - <item>thursday</item> - <item>Thursday</item> - - <item>255</item> <item>tine</item> <item>time</item> - <item>255</item> - <item>tothe</item> - <item>to the</item> - - <item>255</item> - <item>tuesday</item> - <item>Tuesday</item> - <!-- through additional proximity, 'uf' becomes 'of'. 'o' is not next to 'u' so anyone typing 'uf' probably meant 'if', but 'of' is much more common and should be left higher than 'if', hence the need for this entry. --> @@ -664,14 +214,6 @@ <item>vis-a-vis</item> <item>255</item> - <item>wasnt</item> - <item>wasn\'t</item> - - <item>255</item> - <item>wednesday</item> - <item>Wednesday</item> - - <item>255</item> <item>wierd</item> <item>weird</item> @@ -684,22 +226,10 @@ <item>we\'re</item> <item>255</item> - <item>werent</item> - <item>weren\'t</item> - - <item>255</item> - <item>weve</item> - <item>we\'ve</item> - - <item>255</item> <item>whatd</item> <item>what\'d</item> <item>255</item> - <item>whatll</item> - <item>what\'ll</item> - - <item>255</item> <item>whatm</item> <item>what\'m</item> @@ -728,18 +258,10 @@ <item>where\'s</item> <item>255</item> - <item>whod</item> - <item>who\'d</item> - - <item>255</item> <item>wholl</item> <item>who\'ll</item> <item>255</item> - <item>whos</item> - <item>who\'s</item> - - <item>255</item> <item>whove</item> <item>who\'ve</item> @@ -760,22 +282,10 @@ <item>why\'ve</item> <item>255</item> - <item>witha</item> - <item>with a</item> - - <item>255</item> <item>wont</item> <item>won\'t</item> <item>255</item> - <item>wouldnt</item> - <item>wouldn\'t</item> - - <item>255</item> - <item>wouldve</item> - <item>would\'ve</item> - - <item>255</item> <item>yall</item> <item>y\'all</item> @@ -787,16 +297,5 @@ <item>youd</item> <item>you\'d</item> - <item>255</item> - <item>youll</item> - <item>you\'ll</item> - - <item>255</item> - <item>youre</item> - <item>you\'re</item> - - <item>255</item> - <item>youve</item> - <item>you\'ve</item> </string-array> </resources> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 8ecdffb47..5596ba41c 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -57,6 +57,7 @@ <fraction name="key_letter_ratio">42%</fraction> <fraction name="key_large_letter_ratio">45%</fraction> <fraction name="key_label_ratio">25%</fraction> + <fraction name="key_large_label_ratio">32%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="key_hint_label_ratio">28%</fraction> <fraction name="key_uppercase_letter_ratio">22%</fraction> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 01e228499..ce33b73cb 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -58,6 +58,7 @@ <fraction name="key_letter_ratio">40%</fraction> <fraction name="key_large_letter_ratio">42%</fraction> <fraction name="key_label_ratio">28%</fraction> + <fraction name="key_large_label_ratio">28%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> <fraction name="key_hint_label_ratio">28%</fraction> <fraction name="key_uppercase_letter_ratio">26%</fraction> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 7cad3f507..a18371fc9 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -55,6 +55,8 @@ <attr name="keyLargeLetterRatio" format="float" /> <!-- Size of the text for keys with multiple letters, in the proportion of key height. --> <attr name="keyLabelRatio" format="float" /> + <!-- Large size of the text for keys with multiple letters, in the proportion of key height. --> + <attr name="keyLargeLabelRatio" format="float" /> <!-- Size of the text for hint letter (= one character hint label), in the proportion of key height. --> <attr name="keyHintLetterRatio" format="float" /> @@ -275,7 +277,8 @@ <flag name="followKeyLargeLetterRatio" value="0x40" /> <flag name="followKeyLetterRatio" value="0x80" /> <flag name="followKeyLabelRatio" value="0xC0" /> - <flag name="followKeyHintLabelRatio" value="0x100" /> + <flag name="followKeyLargeLabelRatio" value="0x100" /> + <flag name="followKeyHintLabelRatio" value="0x140" /> <flag name="hasPopupHint" value="0x200" /> <flag name="hasShiftedLetterHint" value="0x400" /> <flag name="hasHintLabel" value="0x800" /> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index d8d58dfa0..925eb55fa 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -59,6 +59,7 @@ <fraction name="key_letter_ratio">55%</fraction> <fraction name="key_large_letter_ratio">65%</fraction> <fraction name="key_label_ratio">34%</fraction> + <fraction name="key_large_label_ratio">40%</fraction> <fraction name="key_hint_letter_ratio">25%</fraction> <fraction name="key_hint_label_ratio">44%</fraction> <fraction name="key_uppercase_letter_ratio">35%</fraction> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index b9bec9896..e1f03714a 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -277,21 +277,21 @@ <string name="custom_input_styles_title">Custom input styles</string> <!-- Title of the option menu to add a new style entry in the preference settings [CHAR LIMIT=16] --> <string name="add_style">Add style</string> - <!-- Title of the button to add custom style entry in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the button to add custom style entry in the settings dialog [CHAR LIMIT=15] --> <string name="add">Add</string> - <!-- Title of the button to remove a custom style entry in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the button to remove a custom style entry in the settings dialog [CHAR LIMIT=15] --> <string name="remove">Remove</string> - <!-- Title of the button to save a custom style entry in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the button to save a custom style entry in the settings dialog [CHAR LIMIT=15] --> <string name="save">Save</string> - <!-- Title of the spinner for choosing a language of custom style in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the spinner for choosing a language of custom style in the settings dialog [CHAR LIMIT=15] --> <string name="subtype_locale">Language</string> - <!-- Title of the spinner for choosing a keyboard layout of custom style in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the spinner for choosing a keyboard layout of custom style in the settings dialog [CHAR LIMIT=15] --> <string name="keyboard_layout_set">Layout</string> <!-- The message of the dialog to note that a custom input style needs to be enabled. [CHAR LIMIT=64] --> <string name="custom_input_style_note_message">"Your custom input style needs to be enabled before you start using it. Do you want to enable it now?"</string> - <!-- Title of the button to enable a custom input style entry in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the button to enable a custom input style entry in the settings dialog [CHAR LIMIT=15] --> <string name="enable">Enable</string> - <!-- Title of the button to postpone enabling a custom input style entry in the settings dialog [CHAR LIMIT=12] --> + <!-- Title of the button to postpone enabling a custom input style entry in the settings dialog [CHAR LIMIT=15] --> <string name="not_now">Not now</string> <!-- Toast text to describe the same input style already exists [CHAR LIMIT=64]--> <string name="custom_input_style_already_exists">"The same input style already exists: <xliff:g id="input_style_name">%s</xliff:g>"</string> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index b3c921e9e..e9b0470ea 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -38,6 +38,7 @@ <item name="keyLetterRatio">@fraction/key_letter_ratio</item> <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item> <item name="keyLabelRatio">@fraction/key_label_ratio</item> + <item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item> <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item> <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item> <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item> diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml index 5b3d1b835..a1b2eb475 100644 --- a/java/res/xml-sw600dp/key_styles_common.xml +++ b/java/res/xml-sw600dp/key_styles_common.xml @@ -74,6 +74,15 @@ latin:backgroundType="functional" /> <include latin:keyboardLayout="@xml/key_styles_enter" /> + <!-- Override defaultEnterKeyStyle in key_styles_enter.xml --> + <key-style + latin:styleName="defaultEnterKeyStyle" + latin:code="!code/key_enter" + latin:keyIcon="!icon/enter_key" + latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio" + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" + latin:parentStyle="navigateMoreKeysStyle" /> <key-style latin:styleName="spaceKeyStyle" latin:code="!code/key_space" diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml index b8301bc49..2e5a601b0 100644 --- a/java/res/xml/key_styles_number.xml +++ b/java/res/xml/key_styles_number.xml @@ -131,4 +131,13 @@ latin:keyIcon="!icon/space_key_for_number_layout" latin:keyActionFlags="enableLongPress" latin:parentStyle="numKeyBaseStyle" /> + <!-- Override defaultEnterKeyStyle in key_styles_enter.xml --> + <key-style + latin:styleName="defaultEnterKeyStyle" + latin:code="!code/key_enter" + latin:keyIcon="!icon/enter_key" + latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio" + latin:keyActionFlags="noKeyPreview" + latin:backgroundType="functional" + latin:parentStyle="navigateMoreKeysStyle" /> </merge> diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml index 28bd7a1d2..c59e26247 100644 --- a/java/res/xml/rows_number_normal.xml +++ b/java/res/xml/rows_number_normal.xml @@ -22,7 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Row> -<Key + <Key latin:keyLabel="1" latin:keyStyle="numKeyStyle" /> <Key |