Commit Graph

833 Commits (29f0b0f5784c099d9bf8283e1d07b74c71efc096)

Author SHA1 Message Date
Tadashi G. Takaoka a8fd3af67a Merge "Remove web mode and add webInput boolean" 2011-05-27 09:09:30 -07:00
Tadashi G. Takaoka fa847fe9b5 Add number password keyboard layout to phone
Bug: 4479212
Change-Id: I230371632d5ba0d940e576a9b8b6668079990004
Cherry-pick: Ia0a284a3
2011-05-27 22:13:06 +09:00
Tadashi G. Takaoka 9e2d810dc5 Remove web mode and add webInput boolean
Bug: 4490948
Change-Id: I6fe23c9ab4918eab6806cc621c4d6821c2e1baf9
Cherry-Pick: I4cd1af0b
2011-05-27 21:47:14 +09:00
Tadashi G. Takaoka c29c69a372 Rename filename of hint icons for numbers
Change-Id: Ibd844167199f5d884d97b8fe9f536f47fbe5bdcd
Cherry-Pick: I1f3bc846
2011-05-27 21:14:52 +09:00
Jean Chalard 240297d0ee Add advanced settings screen
Also add an option for popup dismissal delay so as to inaugurate the
new screen.  Besides, remove a path for options to escape from
LatinIME and replace with a direct read from the settings.

Change-Id: I7ec6e724262871fa6523506ecc39f65c5fbe34da
2011-05-13 20:40:21 +09:00
Tadashi G. Takaoka 13e6725a78 Merge "Add minKeyboardHeight attribute to Keyboard layout" 2011-05-13 02:41:50 -07:00
Tadashi G. Takaoka ce1902bb0e Merge "Remove double high-reversed-9 quotation mark" 2011-05-12 23:12:55 -07:00
Tadashi G. Takaoka b05c913fb1 Remove double high-reversed-9 quotation mark
Because current DroidSans font lacks double high-reversed-9 quotation
mark '\u201f' glyph (Bug: 4368421), this change remove it from symbol
keyboard popup mini keyboard. This change also removes corresponding
double low-9 quotation marks as well.

Bug: 4347045
Change-Id: I30d1493376efe5af98722e76999107de5dfcae3e
2011-05-13 13:02:32 +09:00
satok cbcae9a6e8 Merge "Fix the available input locales and moved Recorrection" 2011-05-12 19:33:58 -07:00
satok f733074aae Fix the available input locales and moved Recorrection
Bug: 4409091

Change-Id: I6efd23ebb9528bf1bd35320057a0ea264c187451
2011-05-12 20:26:24 +09:00
Tadashi G. Takaoka ff483e8d0c Add minKeyboardHeight attribute to Keyboard layout
Bug: 4411676
Change-Id: I1f56ba58bacb90790f82326718bf9de95dba5d28
2011-05-12 18:19:12 +09:00
Tadashi G. Takaoka 287d0d47ff Fix Serbian (Cyrillic) keyboard layout
Bug: 4406840
Change-Id: Iae1d8e9752c355d08d7f3d0fe7057fce61ea702f
2011-05-11 20:32:40 +09:00
satok 0d8a4eb367 Add pl keyboard layout
Bug: 4394303

Change-Id: I0fa24829e1240549728d9b81af3e39a024725016
2011-05-06 19:22:08 +09:00
Tadashi G. Takaoka 717cef79ea Fix quotation marks
This change
* Allows snap back from symbols shifted to symbol layout.
* Add "left single", "right single", "single low" and "single high
  reversed" quotation marks to popup characters of "single quote".
* Add "double low" and "double high reversed" quatation marks to popup
  characters of "double quote".
* Add "prime" and "double prime" to popup characters of "degree".
* Disable non-ASCII key of symbol more layout on passowrd input.

Bug: 4345054
Bug: 4347045
Change-Id: I8168ce6a74a9536e4966f7f9d1099ac0132925c7
2011-04-27 15:21:06 +09:00
satok d63135c148 Fix arabic layout for phone
Change-Id: I2b71f44e27f95ba3949e2e2c150696045f3c28b3
2011-04-22 20:52:04 +09:00
satok 940b8d81f3 Merge "Add an debug option to use spacebar switcher" 2011-04-22 00:51:07 -07:00
satok c5a2b51924 Add an debug option to use spacebar switcher
Change-Id: Icc483f097696a1c5a2a7ab037afce19c9cfe837f
2011-04-22 15:54:39 +09:00
Jean Chalard b50591295d Add an option for using bigram prediction.
This change adds the option for bigram prediction under the option
for bigram suggestion. The "prediction" option depends on the
"suggestion" option.
This change also reorders a tad bit the settings screen. Namely, it
sticks both bigram options under a "bigram" category, and groups the
options that did not have a group under a "other options", or misc,
category.
Finally this change also renames the internal name of the "text
corrections" option category to "correction_category" instead of
"prediction_category" which was misleading.

Change-Id: I2d8787c8a391fd8202ed3a686c613494b7260a1e
2011-04-22 15:53:48 +09:00
Tadashi G. Takaoka 6c10cf6bf8 Merge "Rename and reorganize key code" 2011-04-21 23:33:21 -07:00
satok 1b9eecb521 Fix language selection settings
Change-Id: I84e51ce2b80a21650e309e5e6c9ee5f1739170c9
2011-04-21 23:27:46 +09:00
Tadashi G. Takaoka d2c5fdda86 Rename and reorganize key code
Change-Id: I13d6fef7af1c4356a22b0e8aebc9e613b1693ece
2011-04-21 20:32:33 +09:00
satok 49a11524fc Fix language selection settings
Change-Id: I99e2039579a5bd606a8e698cdee2739465b998bc
2011-04-21 19:46:06 +09:00
satok 15a0ba6d74 Check the availability of layouts for showing the input languages in the settings
Bug: 4316889

Change-Id: I746b3ff79c2a6cd4925fca1817d5b209623b5108
2011-04-21 17:17:32 +09:00
Jean Chalard c9bc5c8d34 Merge "Move language-specific keyboard setting to resources." 2011-04-20 01:52:54 -07:00
Jean Chalard c899038eee Move language-specific keyboard setting to resources.
Some flag settings used to be stored in a keyboard layout extravalue setting. This
change:
- Introduces the capability of setting such specific flags in values/config.xml
- Retains the ability to use extravalues (for layout-specific settings), though
  there is no more any such setting at the moment.
- Fixes a bug where loading a dictionary from outside does not initialize the flags.
- Moves Flag to another class.

Note: this needs I705ec68c to avoid breaking the build

Change-Id: Ia7703aae3215b06c0b3cb792821649806e8998c1
2011-04-20 17:31:59 +09:00
Tadashi G. Takaoka 708aa80492 Add mini keyboard fo tab key in web layout
This change also re-orders punctuation mini keyboard.

Bug: 4315046
Change-Id: I567ea417fc8d3cb23dceac6965fa279e6beca970
2011-04-20 15:46:35 +09:00
satok b1ae5d84b1 Merge "Remove debug mode from the settings preference" 2011-04-19 21:52:12 -07:00
satok 39144ca4f9 Change the default value of logging to true
Change-Id: I52198ebca929f02e8b04db77a474ee5a7e79cdea
2011-04-20 11:42:55 +09:00
satok 10f113f5d2 Remove debug mode from the settings preference
Change-Id: I2b3f973f8d59687fe5b95b841449bff5c4b1a2ba
2011-04-20 11:34:20 +09:00
Tadashi G. Takaoka 9c192e1b70 Shrink tab key width on web mode layout
Bug: 4315046
Change-Id: I468ddf14d1f486d2c24cef56ed211ac9228cae43
2011-04-19 18:34:59 +09:00
Tadashi G. Takaoka 740be4493a Fix Arabic mini keyboard precedence
Change-Id: I73e9e8bb243ae89944bf346885529fc3dd6df226
2011-04-13 15:04:29 +09:00
satok 09df2a5bf4 Merge "Remove voice subtypes" 2011-04-12 20:16:46 -07:00
satok b435a6ddca Remove voice subtypes
Bug: 4176028

Change-Id: Icbd699370051c377da281016df3c363f8544a788
2011-04-13 10:41:50 +09:00
Ken Wakasa 33fa046fe3 Additional tweak of gaps for delete/shift keys
bug: 4269094
Change-Id: I62c5b80276d743f86dcf2f3eb5cdc6d7aa519024
2011-04-12 19:07:14 +09:00
Tadashi G. Takaoka 689e7e907b Add Arabic keyboard to phone
Change-Id: I60c312fe9dc383a8048b46d9b54eee535c515aaa
2011-04-11 14:16:02 +09:00
Tadashi G. Takaoka 56abeabced Add visualInsetsLeft and Right as Key attribute
Bug: 4269094
Change-Id: Ic38d326a8e9ef802453c909f3a81d556863acc9b
2011-04-11 12:13:38 +09:00
Tadashi G. Takaoka a8c163f262 Fix suggestion strip layout
This change also removes unused drawable and xml resources.

Bug: 4181825
Change-Id: Ia723376bc5d40900a513df62e89cdfe35b2c859f
2011-04-08 20:03:57 +09:00
Tadashi G. Takaoka 82730b0e09 Merge "Remove redandant key from popup mini keyboard which has settings key" 2011-04-08 02:43:26 -07:00
Tadashi G. Takaoka 1844ee7cf8 Remove redandant key from popup mini keyboard which has settings key
Bug: 4196879
Change-Id: If0ed5cace2d4d0c1f0e225e1003d54c055690387
2011-04-08 18:03:23 +09:00
Tadashi G. Takaoka 6d81e2b79b Increase the horizontal gap between shift/delete and normal keys
This change also adds capability to add horizontal padding to the
keyboard.

Bug: 4269094
Change-Id: I805e76b253a497079517c01bd2a976f8702f7e56
2011-04-08 16:43:01 +09:00
Tadashi G. Takaoka cf4eff3f59 Remove "settings" key popup from "slash" and "atmark" key
Removing "settings" key popup from these keys when there's a dedicated
"settings" key in the layout.

This is followup chnage of I119528c0.

Bug: 4196879
Change-Id: I742cc6d1d890c095610f1e8b9ac91a044ec540b7
2011-04-08 10:27:51 +09:00
Tadashi G. Takaoka e7c0e73a19 Simplify the Key's on state transition
Because handling shift locked state of alphabet keyboard is done by
KeyboardSwitcher, there is no need to change the "on" state of Key
when releasing the key. On the other hand, symbol and symbol shifted
keyboard has fixed "on" state "ALT/MORE" key.

This change also renames the attribute "isModifier" to "isFunctional".

Change-Id: I082885bd2376ae26bdfc378c14add2b5d6be1d4e
2011-04-07 20:28:46 +09:00
Tadashi G. Takaoka 494926fc2b Remove "settings key" popup from "comma key"
Bug: 4196879
Change-Id: I119528c03526b47a1398d9efc2aa307eb0c07ffe
2011-04-07 17:49:49 +09:00
satok 8f9b86fec5 Add settings for theme, userfeedback and other settings (temporary)
Change-Id: I063c48dbf021f5608c241a3543aa2628b5faaa40
2011-04-01 19:48:17 +09:00
Jean Chalard 9107d98290 Add comments and basic reformatting for new files.
Ic4df2a9a introduced new keyboard layouts for Hebrew and Arabic.
This change adds a comment to them alongside with trailing
whitespace suppression.

This change explicitly limits its scope to files introduced by
Ic4df2a9a. It replaces I48927626 which has been deemed too reckless.

Change-Id: Id6b0e47f0623ead0b4e42e57dae359231a2b97fc
2011-03-24 00:32:10 -07:00
Jean Chalard e50add1fbd Add a first version of Hebrew and Arabic keyboard.
The Arabic keyboard is more or less based on PC keyboard and other
sources. It has no means to input diacritics at the moment.
Some data for the Hebrew keyboard was already there, but not used.
This change splits phone and tablet layout and consolidates the
tablet one to something that seems sensible. It can't input diacritics
either at the moment.

Other shortcomings affect those keyboards. For example, normal
Hebrew keyboards switch to capital QWERTY keyboard with shift on,
as there are no capital Hebrew characters, but this version does not
feature this.

It should be mostly possible already to enter Arabic or Hebrew with
these keyboards however.

Change-Id: Ic4df2a9a77ffd03c4f9ee2c47e03c0f43f8e48ae
2011-03-23 22:31:40 -07:00
Tadashi G. Takaoka 6a75cd124d Add alphabet hint to number password layout
Bug: 4063047
Change-Id: I53e79edcb15d4da73a72d14a38224e80b612c115
2011-03-08 18:02:18 -08:00
Jean Chalard c2bbc6a449 Use translation of fallback umlauts digraphs for German.
For German : handle "ae", "oe" and "ue" to be alternate forms for
umlaut-bearing versions of "a", "o" and "u".

Issue: 3275926

Change-Id: I056c707cdacc464ceab63be56c016c7f8439196c
2011-03-03 11:52:23 +09:00
Tadashi G. Takaoka 20887c57a6 Force currency key to "dollar" on password input field
This is followup change of I660c6f50.

Bug: 3413589
Change-Id: I7684150f7c52444884fe02a27e39c6de0105b2d8
2011-02-24 18:11:48 +09:00
Tadashi G. Takaoka 613514252c Dynamic currency key label
The currency key shows different key label depending on the coutnry
code of the keyboard, "dollar", "euro" and "pound".

Bug: 3413589
Change-Id: I660c6f5010629276df3f97d337f4493d1fbccb3f
2011-02-24 16:47:25 +09:00
Tadashi G. Takaoka d9c52ba623 Rename imeOptions attribute of Keyboard to imeAction.
Bug: 3384942
Change-Id: I3ce01b83f0ae37f447de8a7fcdb5d7fe06b108c6
2011-02-18 16:56:05 +09:00
Jean Chalard f0d99b8677 Make the keyboard sound on by default for xlarge screens.
Also change the name of the default value for re-correction for
consistency with other constant names.

Bug: 3426884

Change-Id: I615ba640fb17e6d7514b8a0e4f52028eb0e23908
2011-02-08 12:44:03 +09:00
Tadashi G. Takaoka 79b965e04f Add tablet keyboards supported in Gingerbread
This change also re-orders the laternate characters on mini keyboard.

Bug: 2214959
Change-Id: Id44c5b0c05f9f32ff939ad91d229d83731f2a135
2011-01-27 15:21:01 +09:00
Tadashi G. Takaoka 5cd87e1b1c Disable shortcut key when network is not available
Bug: 3345931
Change-Id: I1deef774598b8e78da4404535b6d3814464a9d2d
2011-01-26 17:07:55 +09:00
satok 0b0c522523 Added voice input languages
bug: 3382825

Change-Id: Iec031dffb86e4b05a4a718d17afe20064d14633e
2011-01-26 15:04:02 +09:00
satok f8ddd13b40 Removed subtype icon for each country and added subtype icon for each mode
Bug: 3286869

Change-Id: I43f151be00d2392c1816a43d37148169ff39a9f0
2011-01-25 14:43:23 +09:00
satok bab08331c0 Add excludeFromLastInputMethod to voice subtype
Bug: 3382702

Change-Id: I0a0a85a509aee9586fafe8771b44892f6bc469bc
2011-01-25 00:34:11 +09:00
satok 439f2dbe1b Change the order of subtypes list
Change-Id: I748ed8e8a280832c1e3170ed070c2ae22ee7d5c1
2011-01-20 02:02:56 +09:00
satok 4022a79957 Merge "Add subtype languages" into honeycomb 2011-01-19 08:17:05 -08:00
satok be324535f6 Add subtype languages
Change-Id: Ib251bd63f79281a4dc1739b213b16e8a936ea319
2011-01-20 01:15:09 +09:00
Jean Chalard 89764ad4ac Simplify text correction settings in latin IME.
Conditionally remove the "Quick fixes", "Bigram suggestions" and
"Usability study mode" options, depending on configuration.
When disabled, have the quick fixes and bigram option become
false if autocorrect is off, and true otherwise.
Also reorder options to bring "Auto correction" above "Show
suggestions".

bug: 3282448

Change-Id: Ib7fd928be417a816ef9e21423a531773069b7468
2011-01-19 20:08:46 +09:00
Jean Chalard ce9c417184 Change separator titles in settings screen.
Add a "General" category to enclose general settings, and rename
"Word suggestion settings" to "Text correction".

bug: 3282448

Change-Id: Ie695683af0646974da82e29e11d1c3a785ef46c7
2011-01-19 19:50:14 +09:00
Jean Chalard fd7d814c81 Simplify latin IME settings page.
Do not show the recorrection option on xlarge terminals,
and make it true by default. Also, bring the Auto-capitalization
at the top of the settings page.

Issue: 3282448
Change-Id: I51a9ae6c7e496be2970107277f0a4ac65b12821e
2011-01-18 18:41:15 +09:00
Tadashi G. Takaoka 41f7fb51b0 Make input language selection settings work
This change also tweaks the padding of candidate strip for phone.

Change-Id: Iefe4dfeb7015e11d5b2d1566121f719d60b1377e
2011-01-14 14:21:12 +09:00
Ken Wakasa 458249e703 Consolidate main dictionary files.
This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager.  Instead we'll probably use offset and size obtained from AssetFileDescriptor.

Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76
2011-01-05 11:31:58 +09:00
Tadashi G. Takaoka 05ddb9a5d2 Add config_default_keyboard_theme_id resource
Change-Id: Ie4e9e85694cfd43fcd1fdfeeaa477f13c372a8a6
2010-12-28 21:06:45 +09:00
Tadashi G. Takaoka c4f71668d7 Remove multi-tap feature
Change-Id: Ife44b3f9d420d77d2cfb51044a8356f02ed63e8b
2010-12-20 21:58:31 +09:00
Tadashi G. Takaoka 9b6d1d52d9 Add popupKeyboardTemplate attribute to Keyboard
This change
- introduces the popupKeyboardTemplate attribute of Keyboard to
  specify XML Keyboard file for popup mini keyboard.
- introduces the maxPopupKeyboardColumn attribute of Keyboard to
  specify the maximum column of popup mini keyboard.
- changes the content format of the popupCharacters attribute of Key.
  It now represents keyLabel, codes and keyTextOutput of each key of
  popup mini keyboard using CSV format.

Bug: 2214959
Change-Id: I539e310f7e38a049ee193de0b4ad5d7afdce37b1
2010-12-17 17:18:28 +09:00
satok 24e1f28f25 Changed Icon for a US English keyboard subtype temporary
Change-Id: I422b9a1c055177c35e4dd9564b408179cf82f21e
2010-12-16 16:58:00 +09:00
Tadashi G. Takaoka 246acc5033 Make "Tab" and "ALT" and "123" as donottranslate resources
Bug: 3273889
Change-Id: I1bd47ffbc7bc92d66d421c5f2787acf14e08e0f7
2010-12-14 15:33:24 +09:00
satok 7f1d3fa5d8 Remove language settings from preference activity
Bug: 3268561

Change-Id: Ia910f0a090dc66c7dd9176999930d8cb763203b0
2010-12-13 15:27:33 +09:00
Tadashi G. Takaoka 9ecad8c2e8 Fix auto correction threshold values array reference
This change also removes unused argument from Suggest.getSuggestions().

Change-Id: I512f8695d22898bb906e136a66e0ee6b521cd1d1
2010-12-13 14:40:49 +09:00
Tadashi G. Takaoka 1b1f7f907f Cleanup unused string resources
This change also renames some "completion" to "correction".

Change-Id: I156dd7ccafe99a632721f20769d5f0ea5915a564
2010-12-12 21:55:00 +09:00
Tadashi G. Takaoka 9502cc177c Remove LatinIME prefix from classes
This change also cleanups preference key string constants

Change-Id: I58510f220a90d00d71a935731abeab87384675bb
2010-12-09 21:54:51 +09:00
Tadashi G. Takaoka 9f01ed51d7 Support keyboardHeight and maxKeyboardHeight to Keyboard XML
This change introduces,
- new attribute keyboardHeight to specify default keyboard height.
- new attribute maxKeyboardHeight to specify maximum keyboard height,
  usually specified by percentage to the screen height.
- keyHeight attribute is obsoleted
- new attribute rowHeight to specify a row height, can be specifed as
  percentage of the keyboard height. And verticalGap is included to
  the row height (row height = key height + vertical gap).

Change-Id: I48a2f2661e8a91a998503a847437c1baf1de9b9c
2010-12-08 17:43:29 +09:00
Tadashi G. Takaoka e6f8bb04b6 Add fr_CH keyboard subtype
Change-Id: I3977f9e201e77a682c1c8bed221cca32204dafbe
2010-12-01 21:26:16 +09:00
Tadashi G. Takaoka 6b1e5fd260 Fix subtype icons in method.xml
Change-Id: I1b157254483446e86d577cdc010b92761754dbb7
2010-12-01 11:09:53 +09:00
Tadashi G. Takaoka 842b3d4115 Support de,fr locale keyboard layouts for tablet
This change introduces,
- support de QWERTZ
- support fr AZERTY
- support fr_CA QWERTY layout
- support fr_CH QWERTZ layout
- refactor some common keyboard row layouts

Bug: 2334086
Change-Id: I3e01e841e0dc72419d55e29d426bdec70655459c
2010-12-01 10:17:16 +09:00
satok dc2a41ff4e Add icons for each subtype
Change-Id: I0a86a781e3b30a8355ccc8083f3ac66af84a05b7
2010-11-30 14:17:01 +09:00
Tadashi G. Takaoka 7f0befe1f0 Update tablet keyboard layout to the latest design
This change introduces shiftedIcon attribute for Key which specifies
icon to draw the shift key while the key is in shifted state.

This change also intriduces new configurable dimension value
key_label_horizontal_alignment_padding which represents horizontal
padding for left or right alignment of key label.

Bug: 3216592
Bug: 3201839
Change-Id: I3aa7392227ce573c404517678e6340a8d1fcb328
2010-11-25 00:11:21 -08:00
Tadashi G. Takaoka 2c60d6e28e Support dedicated number/date keyboard layout
Bug: 3009716
Change-Id: Idc12cc9d8ee4f5febfae4e11712e2aaca327a6ea
2010-11-24 00:16:00 -08:00
Tadashi G. Takaoka 6624fd8736 Support imeOptions condition in <case>
Change-Id: Ie5494601efb29cf65363c4aa3bf5a9ab04a0109a
2010-11-23 23:13:39 -08:00
Tadashi G. Takaoka 59c9930ca9 Support colorScheme <case/> condition in Keyboard XML
Change-Id: Ibbfb99e0e2b15df301f83af6739b7bca01ebf490
2010-11-23 18:07:27 -08:00
Tadashi G. Takaoka 4b8bbbadac Fix odd "more" key behavior on tablet phone number keyboard
Bug: 3176540
Change-Id: Iaa1f3776d5ac236b2655910ede7522ceac36a9a1
2010-11-23 09:52:59 -08:00
Tadashi G. Takaoka 0b60f83192 Support <key-style/> and keyStyle attribute for Keyboard XML
Change-Id: Ie052e989d0180eecfc8c244ba6c60594a46103d1
2010-11-22 18:33:47 -08:00
Tadashi G. Takaoka 04448c2978 Make F1 and Symbol keys static in XML file
Change-Id: If869f5ad4fe8f192f89a8679a4abde99a25e02e6
2010-11-21 03:00:53 -08:00
satok 3757d16083 Merge "Open settings of input method subtype enabler when users are trying to change language." 2010-11-19 16:37:11 -08:00
satok b6c1255f2d Open settings of input method subtype enabler when users are trying to change language.
Change-Id: Id13926a87d43a3972f2a57128379c17b70b50da2
2010-11-20 09:35:05 +09:00
Tadashi G. Takaoka 75fde64890 Cleanup drawable-xlarge resources into drawable-mdpi
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
2010-11-19 01:37:38 -08:00
satok 95175d488b Add an option for the userbility study mode
Change-Id: If41ddfa933f8ade58afa03acbd9536e0477baae8
2010-11-16 07:55:50 +09:00
satok 7599cfea4a Add showing suggestion only on portrait mode and fixing the state of suggestion strip
Change-Id: I7babd1400a3516c87506a3ea4bd46ddaf89e19b4
2010-11-16 07:30:08 +09:00
Tadashi G. Takaoka b0465116bd Keyboard XML supports switch-case-default tags to select rows and keys
Change-Id: I0d92e513757e765d9de98561205754af5a143650
2010-11-12 14:30:25 -08:00
satok 38976d5b96 Add labels for subtypes
- Also changed mode name
- Move the position of a subtype for "US Keyboard" to the top

Change-Id: I4dd7f869801d5efa775fe8a89dde233215f508d9
2010-11-05 11:44:31 +09:00
satok 3b075346b1 Updated icons for the input method subtype
Change-Id: Ib92666357a6921cb7e068c63353b8b3d997c80b2
2010-11-02 23:11:42 +09:00
satok e767595da5 Add an icon for US keyboard subtype
- TODO: add other icons

Change-Id: Ie958b9d59bb33bd6dbfc78a403bfda022bfaf790
2010-10-25 16:58:30 +09:00
Ken Wakasa e354a85ef4 Manual merge of the following Gingerbread changes logically
I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa

bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2
2010-10-20 22:51:33 +09:00
Tadashi G. Takaoka 58bfa35072 Update xlarge drawable of Keyboard
Bug: 3109804
Change-Id: I316f9cfcec377a7d0ea1417e1e3cea55cbdb9e2b
2010-10-19 21:59:17 +09:00
Tadashi G. Takaoka cd7b7d3e8f Specify keyboard metrics with physical unit "inch"
Cherrypick I44f3b2eef8086d6e0b0db53d38f08487549060c6 from Gingerbread

This change also introduces the key background drawables which has no
fixed bottom padding.  Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit.  Other keyboard related length, distance and size are
also specified by physical unit.

Bug: 3066107
Change-Id: Ib38355ebfc2f8d5b1d26c4e90eba87196fbeddfa
2010-10-17 18:19:42 +09:00
Tadashi G. Takaoka 1dac5d491f resolved conflicts for merge of ac777128 to master
Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
2010-10-16 04:57:53 +09:00
Tadashi G. Takaoka 0963c781f2 Make some keys in phone keyboard to darker color
Bug: 3088257
Change-Id: I36b1a0f147c1087a98b91f00d60bf15922861f9c
2010-10-13 14:06:21 +09:00
Ken Wakasa 39004972b1 resolved conflicts for merge of fd64e47c to master
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
2010-10-12 03:15:36 +09:00
Ken Wakasa c2d7ac79bd Tweak key width for 'o'-popup chars.
We'll merge this to master for now, but we should have new attr (such as popupCharWidth) to handle this reasonably in the newly created BaseKeyboard class.

bug: 3082178
Change-Id: I024b946aafbbeb07b865a09f489dacb56f0478d0
2010-10-11 04:32:54 +09:00
Ken Wakasa ad289ae49b am 2fd1de46: am 47a9c3f3: Additional string update for LatinIME\'s re-correction preference item.
Merge commit '2fd1de46010c9c7836fcae94180d067c50677bab'

* commit '2fd1de46010c9c7836fcae94180d067c50677bab':
  Additional string update for LatinIME's re-correction preference item.
2010-10-08 14:36:47 -07:00
Tadashi G. Takaoka ff4d21bd29 Share 4th row of non-xlarge qwerty keyboard using <include>
Change-Id: Iff337e1c6ef3a17fd96a5e5f1c3c4a21190aac1c
2010-10-08 01:24:28 +09:00
Ken Wakasa 47a9c3f3d9 Additional string update for LatinIME's re-correction preference item.
Follow-up to I703054c9

bug: 3063598

Change-Id: Ic9d752b8588a620b3e256fe38f3a6a0c9c093053
2010-10-07 01:02:06 +09:00
Tadashi G. Takaoka 66e306d01c Add keyHintIcon attribute to BaseKeyboard.Key class
This keyHintIcon attribute is used to specify hint icon drawable at
top right corner of Key.

Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c
2010-10-05 20:28:04 +09:00
Mitsuhiro Shimoda b1abda8d62 Add an auto complete's threshold option.
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
2010-10-05 14:44:00 +09:00
satok 4fc510a789 Unbundle Keyboard.java to BaseKeyboard.java
Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
2010-10-02 00:02:00 +09:00
Tadashi G. Takaoka 932a1b756d am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'

* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
  Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:04:38 -07:00
Tadashi G. Takaoka 8e1f1be0f3 Long press mic/comma key bring mini keyboard with settings
Bug: 3050703

Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a
2010-10-01 19:27:37 +09:00
satok a48d298d10 resolved conflicts for merge of b9c0ed59 to master
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
satok bf96661d33 Add Debug Settings Activity
Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
Tadashi G. Takaoka 051511fa09 am 1d82ee9a: am 56cd6df9: Merge "Space key will no longer auto-repeat" into gingerbread
Merge commit '1d82ee9a13b1e57af80d2bd0e3f879305bda137d'

* commit '1d82ee9a13b1e57af80d2bd0e3f879305bda137d':
  Space key will no longer auto-repeat
2010-09-21 10:43:52 -07:00
Tadashi G. Takaoka aaa163b2b7 Space key will no longer auto-repeat
Bug: 3014225
Change-Id: I94d4904726985d5e17b665d4042c873ea07221f1
2010-09-21 13:00:13 +09:00
Ken Wakasa 86fa29ade9 DO NOT MERGE. Get rid of the user feedback preference from Gingerbread.
Change-Id: I2f0dc3b0cba78c85249cb6cecc9b5c588de4f26b
2010-09-17 18:12:03 +09:00
Tadashi G. Takaoka b40ca031b7 am 525776b6: am ed8eabcc: Cleanup keyboard layout files
Merge commit '525776b681a0548fa6f98ee22a74ae4225c7fa07'

* commit '525776b681a0548fa6f98ee22a74ae4225c7fa07':
  Cleanup keyboard layout files
2010-09-16 04:16:36 -07:00
Tadashi G. Takaoka ed8eabcc39 Cleanup keyboard layout files
Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060
2010-09-16 20:02:04 +09:00
Tadashi G. Takaoka 5d007ef380 am 89e21ee1: am 08cfebda: Move comma as default position of mini keyboard
Merge commit '89e21ee1f5be55ac3db224ab54b27cc604087efa'

* commit '89e21ee1f5be55ac3db224ab54b27cc604087efa':
  Move comma as default position of mini keyboard
2010-09-15 21:43:19 -07:00
Tadashi G. Takaoka 08cfebda8b Move comma as default position of mini keyboard
Bug: 3000978
Change-Id: I0369b3dc6ae58b77e7af112e446ae8189f5bbfc9
2010-09-16 12:22:53 +09:00
Ken Wakasa 2b90a1adcb am 13a6c8c1: am 1508c0e8: Add a new preference item to show/hide the settings key.
Merge commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac'

* commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac':
  Add a new preference item to show/hide the settings key.
2010-09-15 16:49:53 -07:00
Ken Wakasa 1508c0e84f Add a new preference item to show/hide the settings key.
bug: 2998722

Change-Id: Iac1641c338388fd8f85e0cf47e31afdaeb34c0c0
2010-09-16 02:48:10 +09:00
Ken Wakasa 22a2215c1e am 2c424922: am 9717d5b1: Get rid of execution bit
Merge commit '2c42492224a2c4d9533fe9a8f4b994bc3f3a90e0'

* commit '2c42492224a2c4d9533fe9a8f4b994bc3f3a90e0':
  Get rid of execution bit
2010-09-15 07:06:58 -07:00
Ken Wakasa 9717d5b1ee Get rid of execution bit
Change-Id: I25b530c2ab50c045da321e00d905cbec19188ea3
2010-09-14 11:51:58 +09:00
Tadashi G. Takaoka e5875d6d7e am ad20a70b: am 3c559110: Merge "Add digit alternates" into gingerbread
Merge commit 'ad20a70bd9241eb435dd6b5b5b142746f675fd9e'

* commit 'ad20a70bd9241eb435dd6b5b5b142746f675fd9e':
  Add digit alternates
2010-09-08 21:36:40 -07:00
Tadashi G. Takaoka 62432ed453 am 42921b85: am c29ef3ec: Remove unnecessary android:codes attribute
Merge commit '42921b85d34985a7c819f3d4965f1819de2b2685'

* commit '42921b85d34985a7c819f3d4965f1819de2b2685':
  Remove unnecessary android:codes attribute
2010-09-08 10:38:03 -07:00
satok 938ba36710 am 6ee4e439: am 31e2a94a: Merge "Fix the bacground color for "/" in URL mode" into gingerbread
Merge commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592'

* commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592':
  Fix the bacground color for "/" in URL mode
2010-09-08 10:37:53 -07:00
Tadashi G. Takaoka 163a5557ec am 2d5e34b7: am 3625c973: Remove unused azerty.xml keyboard layout
Merge commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347'

* commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347':
  Remove unused azerty.xml keyboard layout
2010-09-08 10:37:50 -07:00
Tadashi G. Takaoka 716fb24a67 am c20193cc: am 232863ac: Re-formatting keyboard definition xml files
Merge commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a'

* commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a':
  Re-formatting keyboard definition xml files
2010-09-08 10:34:52 -07:00
Tadashi G. Takaoka 012075a711 Add digit alternates
This also re-orders keyboard layout attribute and adds some
android:popupCharacters.

Bug: 2973749
Change-Id: I300fb4029a1844947731cb98a464d8d754cb03ef
2010-09-09 01:06:58 +09:00
Tadashi G. Takaoka c29ef3ec15 Remove unnecessary android:codes attribute
If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.

Also introduce readable codes as @integer/key_XXX resources

Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652
2010-09-08 18:16:30 +09:00
satok 31e2a94a09 Merge "Fix the bacground color for "/" in URL mode" into gingerbread 2010-09-08 01:36:24 -07:00
satok 007803c390 Fix the bacground color for "/" in URL mode
Change-Id: I832274244a9677ac98256ddfc4a25fdca517e228
2010-09-08 17:28:21 +09:00
Tadashi G. Takaoka 3625c97338 Remove unused azerty.xml keyboard layout
Change-Id: Ie94ee27bbfc0b894243063fced1e537aec3ed7ec
2010-09-08 16:02:07 +09:00
Tadashi G. Takaoka 232863ac1d Re-formatting keyboard definition xml files
Just re-formating with eclipse editor.

Bug: 2973749
Change-Id: I18bc682c68df6239e54dd71ed3797d55fd5a1552
2010-09-08 15:14:53 +09:00
satok e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
satok 0723056043 Merge "Add shared preference for re-correction" into gingerbread 2010-09-06 23:23:40 -07:00
satok 66b42a1c2d Add shared preference for re-correction
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
2010-09-07 15:23:10 +09:00
satok 6a454a9fa0 am ed34cd19: am d27c7aea: Add isModifier to the buttons in the lowest line
Merge commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f'

* commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f':
  Add isModifier to the buttons in the lowest line
2010-09-06 23:08:23 -07:00
satok d27c7aea7c Add isModifier to the buttons in the lowest line
Change-Id: I2d5c9e753f0f6fa21fdcfa7b55e81e6a3e3ea64f
2010-09-07 14:57:49 +09:00
Ken Wakasa 7ec731a7ee am b6e3cb8f: am a8d9702f: Fix layout issue of the bottom row in web entry mode
Merge commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791'

* commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791':
  Fix layout issue of the bottom row in web entry mode
2010-09-05 06:46:35 -07:00
Ken Wakasa a8d9702fc4 Fix layout issue of the bottom row in web entry mode
bug: 2977061
Change-Id: I76e0f4a21480d10f79fd5dcbe58c63cc3516d5d7
2010-09-05 22:26:55 +09:00
Tadashi G. Takaoka 6c8109dc15 am a723409a: am f0fd5065: Merge "Add a number alternation to English popup mini keyboard" into gingerbread
Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00'

* commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00':
  Add a number alternation to English popup mini keyboard
2010-09-02 12:56:00 -07:00
Tadashi G. Takaoka 3b4ecdeb05 Add a number alternation to English popup mini keyboard
This change is only for English locale.  For other locales we should
need specification because keyboard layout and alternations are
different by locale.

Bug: 2959169
Change-Id: Ib63f53ce6c30d75eff78777aa0049b05d58ce55f
2010-09-02 21:06:30 +09:00
satok d5180e0401 am 81f7989c: am c175e80d: Merge "Add modifiers to functional keys" into gingerbread
Merge commit '81f7989c1aa626f10e2ad8def6de7003b96dcef0'

* commit '81f7989c1aa626f10e2ad8def6de7003b96dcef0':
  Add modifiers to functional keys
2010-09-01 22:39:39 -07:00
satok c175e80d57 Merge "Add modifiers to functional keys" into gingerbread 2010-09-01 22:36:06 -07:00
satok d383364ee4 Add modifiers to functional keys
- update assets for language switcher

Change-Id: I8f29d3d38fb73ab5673f9e58cf28ed37cc8b4004
2010-09-02 14:18:46 +09:00
satok 11b448528b am c5363012: am a327485e: Change the preference name for a theme and remove a preference settings
Merge commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc'

* commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc':
  Change the preference name for a theme and remove a preference settings
2010-09-01 22:07:20 -07:00
satok a327485e59 Change the preference name for a theme and remove a preference settings
Change-Id: I5ad980559477775eb44df022e54ce5ef32398601
2010-09-02 13:54:30 +09:00
satok ee01bf1408 am 308acfa7: am ac4f8e46: Merge "Change background color for functional keys in LatinIME" into gingerbread
Merge commit '308acfa714a3a0aae073871e76e753b5a98096d1'

* commit '308acfa714a3a0aae073871e76e753b5a98096d1':
  Change background color for functional keys in LatinIME
2010-09-01 20:06:05 -07:00
satok dd8dd9fc1b Change background color for functional keys in LatinIME
Change-Id: I45f13c1fd139ce43478e5d0b2cdb62e56e9f77a8
2010-09-02 11:47:33 +09:00
satok 132927f20e am 4d09b2e7: am 31adfa78: Add a new theme for Gingerbread
Merge commit '4d09b2e78e68ef0f1b713b10e280e56d91592717'

* commit '4d09b2e78e68ef0f1b713b10e280e56d91592717':
  Add a new theme for Gingerbread
2010-09-01 08:30:31 -07:00
satok 31adfa78e2 Add a new theme for Gingerbread
bug: 2959293

Change-Id: I8aef19a7485ffd5639a177aee21103b3a1e04cf2
2010-09-01 16:18:01 +09:00
satok 981ddd228d am 28f6351d: am 673aed42: Add settings button
Merge commit '28f6351df341bd27c330b79f315e7419f2f35100'

* commit '28f6351df341bd27c330b79f315e7419f2f35100':
  Add settings button
2010-08-31 10:10:15 -07:00
satok 673aed42c3 Add settings button
- delete unused keyboard layout

Change-Id: Iab39446653460797f1ca876a7d9a23190c3a8df6
2010-08-31 14:03:50 +09:00
Tadashi G. Takaoka a66ccc3e8d am 1cd7d96f: am ed5ce6c1: Merge "Remove extension keyboard" into gingerbread
Merge commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1'

* commit '1cd7d96fe42e63577d70e911c4b5dbfd8b50bba1':
  Remove extension keyboard
2010-08-30 08:34:08 -07:00
Tadashi G. Takaoka d2a431efa7 Remove extension keyboard
Bug: 2959287
Change-Id: I344ac58b4119e96daf5928c784275ee0b7095958
2010-08-30 21:20:55 +09:00
satok 8650230abc am e975c196: am 5d55cf6d: Remove Log functions from Gingerbread
Merge commit 'e975c196c5638ac7f5a61e45100a6eba49900412'

* commit 'e975c196c5638ac7f5a61e45100a6eba49900412':
  Remove Log functions from Gingerbread
2010-08-30 02:01:20 -07:00
satok 5d55cf6dfc Remove Log functions from Gingerbread
Change-Id: I0ab19726a6bfaf14b42c05903f38dfb74cbd0d37
2010-08-30 16:32:50 +09:00
satok cb6221257a DO NOT MERGE. Remove a preference for bigram suggestion
Change-Id: I1a9142d988352abf88da5eefe1d02596c7fc2beb
2010-08-30 14:56:49 +09:00
Tadashi G. Takaoka 3ee0f70c3e am 6ad0d15c: am 7986d783: Merge "Disable long-press on shift and symbol keys" into gingerbread
Merge commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c'

* commit '6ad0d15ca28aa23a85c2480966bc58b2f2d4694c':
  Disable long-press on shift and symbol keys
2010-08-27 16:04:23 -07:00
Tadashi G. Takaoka cec1495071 Disable long-press on shift and symbol keys
Long-press on shift and symbol keys will conflict with press-and-hold
these keys and press normal key (a.k.a. multi touch support).

Bug: 2910379

Change-Id: I27007b55a30a3699bf63fd8f64d58c4b23d97d9f
2010-08-27 15:47:35 +09:00
satok 979f869096 DO NOT MERGE. Backport LatinIME from master to Gingerbread
TODO: Cleanup will follow.

Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
2010-08-20 14:37:03 +09:00
satok 22ac244d5e Add subtype to method.xml
Change-Id: I6006c729f89cc91d5674c19b95cf19ad2cab14cf
2010-08-19 20:02:00 +09:00
Yohei Fujii 0b0a686281 add new preference for popup preview
this option is disabled as the default at x-large

Bug:2909517

Change-Id: Ifda1b7ff89bc4beeee02ba0f3e01d441a9435b37
2010-08-12 16:45:44 +09:00
satok db60e6f369 Add a layout for a black-characters based theme
bug: 2838151

Change-Id: Ia7136ac7432258386a53ebec2b26251c8caae0ea
2010-07-29 14:44:34 +09:00
Jae Yong Sung 80aa14fd43 - separate dict (uses xml)
- retrieve bigrams that only starts with character typed and neighbor keys
- contacts bigram
- performance measure

bug: 2873133

Change-Id: If97c005b18c82f3fafef50009dd2dfd972b0ab8f
2010-07-28 11:08:08 -07:00
satok 7df1c4e6c9 Change the default vaule of Log to be false
Change-Id: I8a3c0ce81b67e27b7559b534b4ccde2ad0783dbc
2010-07-20 17:46:09 +09:00
satok b9c57e6540 Merge remote branch 'goog/master'
Conflicts:
	java/res/xml/prefs.xml
	java/src/com/android/inputmethod/latin/BinaryDictionary.java
	java/src/com/android/inputmethod/latin/Dictionary.java
	java/src/com/android/inputmethod/latin/ExpandableDictionary.java
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/Suggest.java
	tests/src/com/android/inputmethod/latin/tests/SuggestTests.java
2010-07-16 13:02:45 +09:00
Jae Yong Sung 937d5ad013 added bigram prediction
- after first character, only suggests bigram data (but doesn't autocomplete)
  - after second character, words from dictionary gets rearranged by using bigram
  - compatible with old dictionary
  - added preference option to disable bigram

Change-Id: Ia8f4e8fa55e797e86d858fd499887cd396388411
2010-07-13 11:33:39 -07:00
Ken Wakasa 67607ea8b1 Fix "pi" input issues. Added a popup for greek capital pi. Bug: 2220892
Change-Id: Ie465e2ed93c79b0efe9d518cc44df1028f1bb392
2010-06-30 19:10:11 +09:00
satok 6c20ab55b5 Add a typeFace element and a symbol's color element
- add default bold theme
- add

Change-Id: Ie3f31a6973c12e7f8b885d0036f50e8647c9fe82
2010-06-29 08:41:33 +09:00
satok 8edbaf0433 Hide debug mode
- Tap feedback option 10 times, then debug mode will be enabled.
- Change default value of KeyboardMode to avoid NPE
- Update version code

Change-Id: I3a4e64db0d3aa9a08f0e3b3ad1669e728e32cddf
2010-06-03 19:25:12 +09:00
satok faeed22612 Add black resources
Change-Id: Ibd1ac2610b70693975011f85e232348388245553
2010-05-31 20:38:38 +09:00
satok 2776a9f2c3 Change default theme to Ginger Bread "6"
Change-Id: I68d5519c03dba0f8b6344a103c5bcf4f9b18e760
2010-05-28 02:18:09 +09:00
satok 574a7cc82d Fix the bug that black symbols are shown when only one lanugage is selected.
Change-Id: I15f83fc43d91c2c9d74b40fdcecdfe239242d565
2010-05-28 02:01:32 +09:00
satok 01303e39f5 Commit on finishInput
Change-Id: I26254cfdaecd0d85571be3f930476040de935d6c
2010-05-19 15:20:03 +09:00
satok 853083627a Add logging for UI
Change-Id: Ib47919be442feb7a0cb22e886a537ef4ff5b8533
2010-05-17 18:41:04 +09:00
satok a0f8739914 Add Keyboard Theme Switcher
Change-Id: If1bf7d20e4f8a47a7c0429d2445431dc73c1b31b
2010-05-17 17:37:09 +09:00
satok 912fb384da Merge commit 'goog/master' 2010-05-11 10:37:11 +09:00
satok ee2ab40c7a Add settings for "enable log" to UI
Change-Id: Ib6ebfbc586dbea4dce037e484598cbc47ba58c7e
2010-05-10 19:00:54 +09:00
satok 8a3f6dfba9 Fix hardcoded "isDefault" setting
Bug:2661261

- Changed true to @bool/im_is_default
- isDefault was changed in https://android-git.corp.google.com/g/#patch,sidebyside,37627,3,res/xml/method.xml by mistake

Change-Id: Id1c20c292bed27523fb41f32514f2abdee11f992
2010-05-07 18:00:45 +09:00
Amith Yamasani 6aab33105a Remove .com key from URL and Email address keyboards. Bug: 2630268
Have the spacebar be normal width and remove the .com keys.

Change-Id: I470ee4ffa2c84b91e3207e016c99bc66b34ef564
2010-04-27 11:30:17 -07:00
Amith Yamasani 07b1603a3f Don't let the native code target be included twice when unbundling.
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.

Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
2010-03-09 15:01:09 -08:00